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 | |
| parent | fc849d8d6b90e5c1e0c37bc0d60dd92b2fe7347f (diff) | |
| download | git-rs/check-ignore-multi.tar.gz | |
check-ignore: fix mix of directories and other file typesrs/check-ignore-multi
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>
| -rw-r--r-- | builtin/check-ignore.c | 3 | ||||
| -rwxr-xr-x | t/t0008-ignores.sh | 20 |
2 files changed, 22 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); } diff --git a/t/t0008-ignores.sh b/t/t0008-ignores.sh index d27f438bf4..54a4703ef1 100755 --- a/t/t0008-ignores.sh +++ b/t/t0008-ignores.sh @@ -775,6 +775,26 @@ test_expect_success PIPE 'streaming support for --stdin' ' echo "$response" | grep "^:: two" ' +test_expect_success 'existing file and directory' ' + test_when_finished "rm one" && + test_when_finished "rmdir top-level-dir" && + >one && + mkdir top-level-dir && + git check-ignore one top-level-dir >actual && + grep one actual && + grep top-level-dir actual +' + +test_expect_success 'existing directory and file' ' + test_when_finished "rm one" && + test_when_finished "rmdir top-level-dir" && + >one && + mkdir top-level-dir && + git check-ignore top-level-dir one >actual && + grep one actual && + grep top-level-dir actual +' + ############################################################################ # # test whitespace handling |