gitignore(5): Allow "foo/" in ignore list to match directory "foo"

[git.git] / unpack-trees.c

diff --git a/unpack-trees.c b/unpack-trees.c
index aa2513ed798969c02fc5e14097666eb4c4c02bae..11af2636c27b53d2fed14b71e16e6991892c241e 100644 (file)
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -523,7 +523,7 @@ static void verify_absent(struct cache_entry *ce, const char *action,
        if (!lstat(ce->name, &st)) {
                int cnt;
 
-               if (o->dir && excluded(o->dir, ce->name))
+               if (o->dir && excluded(o->dir, ce->name, ce_to_dtype(ce)))
                        /*
                         * ce->name is explicitly excluded, so it is Ok to
                         * overwrite it.