summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-01-27 10:48:32 -0800
committerJunio C Hamano <gitster@pobox.com>2014-01-27 10:48:32 -0800
commit8bba7206b503b63a8208355f66bc09c981072d51 (patch)
tree424ad832da62d397cd8ef7a24b0abbcc860413ee
parent1ad5417a264c1297ed5c9bd7763a4e9c86594c2a (diff)
parente4ddb05720710213108cd13ddd5a115e12a6211d (diff)
downloadgit-8bba7206b503b63a8208355f66bc09c981072d51.tar.gz
Merge branch 'as/tree-walk-fix-aggressive-short-cut'
* as/tree-walk-fix-aggressive-short-cut: tree_entry_interesting: match against all pathspecs
-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 15a491295e..9f5659f7fe 100755
--- a/t/t4010-diff-pathspec.sh
+++ b/t/t4010-diff-pathspec.sh
@@ -127,4 +127,17 @@ test_expect_success 'diff-tree ignores trailing slash on submodule path' '
test_cmp expect actual
'
+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 c29b6a3a56..79dba1d0f4 100644
--- a/tree-walk.c
+++ b/tree-walk.c
@@ -749,7 +749,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