diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-02-16 17:57:06 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-02-16 17:57:06 -0800 |
| commit | 987e315a6b5a5dd224602f09b9dc7c0fe9c7d024 (patch) | |
| tree | ce10af22609413c4316e12335387bcfa0ef1bf9b /unpack-trees.c | |
| parent | 1ae419cb3902e6cc45538a9673539ed5316fcf30 (diff) | |
| parent | 6831a88ac03759a8133f10ffd52ad235a081a8a3 (diff) | |
| download | git-987e315a6b5a5dd224602f09b9dc7c0fe9c7d024.tar.gz | |
Merge branch 'jc/gitignore-ends-with-slash'
* jc/gitignore-ends-with-slash:
gitignore: lazily find dtype
gitignore(5): Allow "foo/" in ignore list to match directory "foo"
Diffstat (limited to 'unpack-trees.c')
| -rw-r--r-- | unpack-trees.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/unpack-trees.c b/unpack-trees.c index ff46fd62fd..ec558f9005 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -521,8 +521,9 @@ static void verify_absent(struct cache_entry *ce, const char *action, if (!lstat(ce->name, &st)) { int cnt; + int dtype = ce_to_dtype(ce); - if (o->dir && excluded(o->dir, ce->name)) + if (o->dir && excluded(o->dir, ce->name, &dtype)) /* * ce->name is explicitly excluded, so it is Ok to * overwrite it. |