summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Andy Spencer <andy753421@gmail.com>2014-01-25 22:06:46 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-01-27 09:01:50 -0800
commite4ddb05720710213108cd13ddd5a115e12a6211d (patch)
treee73402b2b99d27e2e2f2399e8fb9aa238f28a27d
parentGit 1.8.4.5 (diff)
downloadtgif-e4ddb05720710213108cd13ddd5a115e12a6211d.tar.xz
tree_entry_interesting: match against all pathspecs
The current basedir compare aborts early in order to avoid futile recursive searches. However, a match may still be found by another pathspec. This can cause an error while checking out files from a branch when using multiple pathspecs: $ git checkout master -- 'a/*.txt' 'b/*.txt' error: pathspec 'a/*.txt' did not match any file(s) known to git. Signed-off-by: Andy Spencer <andy753421@gmail.com> Acked-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/t4010-diff-pathspec.sh13
-rw-r--r--tree-walk.c2
2 files changed, 14 insertions, 1 deletions
diff --git a/t/t4010-diff-pathspec.sh b/t/t4010-diff-pathspec.sh
index af5134b70c..589bc6bfb4 100755
--- a/t/t4010-diff-pathspec.sh
+++ b/t/t4010-diff-pathspec.sh
@@ -110,4 +110,17 @@ test_expect_success 'diff-tree -r with wildcard' '
test_cmp expected result
'
+test_expect_success 'diff multiple wildcard pathspecs' '
+ mkdir path2 &&
+ echo rezrov >path2/file1 &&
+ git update-index --add path2/file1 &&
+ tree3=`git write-tree` &&
+ git diff --name-only $tree $tree3 -- "path2*1" "path1*1" >actual &&
+ cat <<-\EOF >expect &&
+ path1/file1
+ path2/file1
+ EOF
+ test_cmp expect actual
+'
+
test_done
diff --git a/tree-walk.c b/tree-walk.c
index c626135234..d5914f598d 100644
--- a/tree-walk.c
+++ b/tree-walk.c
@@ -696,7 +696,7 @@ match_wildcards:
if (item->nowildcard_len &&
!match_wildcard_base(item, base_str, baselen, &matched))
- return entry_not_interesting;
+ continue;
/*
* Concatenate base and entry->path into one and do