summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-04-18 14:18:32 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-04-18 14:18:32 -0700
commit08e7239c36a477c52ac83488537600a494002b31 (patch)
tree3f0ec5559df41d2d22c86d0aba1415b6f7cb1a44 /t
parentMerge branch 'js/maint-submodule-checkout' into maint (diff)
parentmatch_tree_entry(): a pathspec only matches at directory boundaries (diff)
downloadtgif-08e7239c36a477c52ac83488537600a494002b31.tar.xz
Merge branch 'bs/maint-1.6.0-tree-walk-prefix' into maint
* 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
Diffstat (limited to 't')
-rwxr-xr-xt/t3101-ls-tree-dirname.sh6
-rwxr-xr-xt/t4010-diff-pathspec.sh8
2 files changed, 14 insertions, 0 deletions
diff --git a/t/t3101-ls-tree-dirname.sh b/t/t3101-ls-tree-dirname.sh
index 4dd7d12bac..51cb4a30f5 100755
--- a/t/t3101-ls-tree-dirname.sh
+++ b/t/t3101-ls-tree-dirname.sh
@@ -135,4 +135,10 @@ test_expect_success \
EOF
test_output'
+test_expect_success 'ls-tree filter is leading path match' '
+ git ls-tree $tree pa path3/a >current &&
+ >expected &&
+ test_output
+'
+
test_done
diff --git a/t/t4010-diff-pathspec.sh b/t/t4010-diff-pathspec.sh
index 9322298ecc..94df7ae53a 100755
--- a/t/t4010-diff-pathspec.sh
+++ b/t/t4010-diff-pathspec.sh
@@ -62,4 +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