From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 27 Jan 2014 18:48:32 +0000 (-0800)
Subject: Merge branch 'as/tree-walk-fix-aggressive-short-cut'
X-Git-Tag: v1.9-rc1~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8bba7206b503b63a8208355f66bc09c981072d51;p=git

Merge branch 'as/tree-walk-fix-aggressive-short-cut'

* as/tree-walk-fix-aggressive-short-cut:
  tree_entry_interesting: match against all pathspecs
---

8bba7206b503b63a8208355f66bc09c981072d51
diff --cc t/t4010-diff-pathspec.sh
index 15a491295e,589bc6bfb4..9f5659f7fe
--- a/t/t4010-diff-pathspec.sh
+++ b/t/t4010-diff-pathspec.sh
@@@ -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