mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/gitignore-ends-with-slash'

Browse Source 
* jc/gitignore-ends-with-slash:
  gitignore: lazily find dtype
  gitignore(5): Allow "foo/" in ignore list to match directory "foo"
This commit is contained in:
Junio C Hamano
2008-02-16 17:57:06 -08:00
parent 1ae419cb39 6831a88ac0
commit 987e315a6b
7 changed files with 106 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
unpack-trees.c
View File

@ -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.