From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 3 May 2009 22:01:19 +0000 (-0700)
Subject: Merge branch 'bs/maint-1.6.0-tree-walk-prefix' into maint-1.6.1
X-Git-Tag: v1.6.1.4~3
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/652f0c8f1df362755253fe9c5a975be7e5a5cbdc?hp=-c

Merge branch 'bs/maint-1.6.0-tree-walk-prefix' into maint-1.6.1

* bs/maint-1.6.0-tree-walk-prefix:
match_tree_entry(): a pathspec only matches at directory boundaries
tree_entry_interesting: a pathspec only matches at directory boundary
---

652f0c8f1df362755253fe9c5a975be7e5a5cbdc
diff --combined t/t4010-diff-pathspec.sh
index 9322298ecc,4c4c8b1570..94df7ae53a
--- a/t/t4010-diff-pathspec.sh
+++ b/t/t4010-diff-pathspec.sh
@@@ -10,7 -10,7 +10,7 @@@ Prepare
          path1/file1
  '
  . ./test-lib.sh
 -. ../diff-lib.sh ;# test-lib chdir's into trash
 +. "$TEST_DIRECTORY"/diff-lib.sh ;# test-lib chdir's into trash
  
  test_expect_success \
      setup \
@@@ -62,4 -62,12 +62,12 @@@ test_expect_success 
      'git diff-index --cached $tree -- file0/ >current &&
       compare_diff_raw current expected'
  
+ test_expect_success 'diff-tree pathspec' '
+ 	tree2=$(git write-tree) &&
+ 	echo "$tree2" &&
+ 	git diff-tree -r --name-only $tree $tree2 -- pa path1/a >current &&
+ 	>expected &&
+ 	test_cmp expected current
+ '
+ 
  test_done