Merge branch 'as/tree-walk-fix-aggressive-short-cut'
authorJunio C Hamano <gitster@pobox.com>
Mon, 27 Jan 2014 18:48:32 +0000 (10:48 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 27 Jan 2014 18:48:32 +0000 (10:48 -0800)
* as/tree-walk-fix-aggressive-short-cut:
tree_entry_interesting: match against all pathspecs

1  2 
t/t4010-diff-pathspec.sh
tree-walk.c
index 15a491295ed3b85cb4a66d46e720e352787a8344,589bc6bfb4543324dcf6f166c4db482958f26e63..9f5659f7fe4df23d805e6c38264a1ebf38fc2538
@@@ -110,21 -110,17 +110,34 @@@ test_expect_success 'diff-tree -r with 
        test_cmp expected result
  '
  
 +test_expect_success 'setup submodules' '
 +      test_tick &&
 +      git init submod &&
 +      ( cd submod && test_commit first; ) &&
 +      git add submod &&
 +      git commit -m first &&
 +      ( cd submod && test_commit second; ) &&
 +      git add submod &&
 +      git commit -m second
 +'
 +
 +test_expect_success 'diff-tree ignores trailing slash on submodule path' '
 +      git diff --name-only HEAD^ HEAD submod >expect &&
 +      git diff --name-only HEAD^ HEAD submod/ >actual &&
 +      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 --cc tree-walk.c
Simple merge