diff options
| author |  René Scharfe <l.s.r@web.de> | 2018-02-10 13:38:29 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-02-12 13:09:35 -0800 |
| commit | d60771e93046e9e11183c6ff1fcafd334f8c0453 (patch) | |
| tree | b104f07d171ab35990d422e29534e2a5e6d67bb3 /builtin | |
| parent | Git 2.14.3 (diff) | |
| download | tgif-d60771e93046e9e11183c6ff1fcafd334f8c0453.tar.xz | |
check-ignore: fix mix of directories and other file types
In check_ignore(), the first pathspec item determines the dtype for any
subsequent ones. That means that a pathspec matching a regular file can
prevent following pathspecs from matching directories, which makes no
sense. Fix that by determining the dtype for each pathspec separately,
by passing the value DT_UNKNOWN to last_exclude_matching() each time.
Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/check-ignore.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/check-ignore.c b/builtin/check-ignore.c index 3e280b9c7a..ec9a959e08 100644 --- a/builtin/check-ignore.c +++ b/builtin/check-ignore.c @@ -72,7 +72,7 @@ static int check_ignore(struct dir_struct *dir, { const char *full_path; char *seen; - int num_ignored = 0, dtype = DT_UNKNOWN, i; + int num_ignored = 0, i; struct exclude *exclude; struct pathspec pathspec; @@ -104,6 +104,7 @@ static int check_ignore(struct dir_struct *dir, full_path = pathspec.items[i].match; exclude = NULL; if (!seen[i]) { + int dtype = DT_UNKNOWN; exclude = last_exclude_matching(dir, &the_index, full_path, &dtype); } |