diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-05-03 15:01:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-05-03 15:01:19 -0700 |
| commit | 652f0c8f1df362755253fe9c5a975be7e5a5cbdc (patch) | |
| tree | a3b08e754f6128a37ca14741d2269b08489f0613 /t | |
| parent | 934747323c397ffe64b6dcdf2bf73128d8e36968 (diff) | |
| parent | 8092bfb6c23776d72ce4b38a3b517c3753c3b9fe (diff) | |
| download | git-652f0c8f1df362755253fe9c5a975be7e5a5cbdc.tar.gz git-652f0c8f1df362755253fe9c5a975be7e5a5cbdc.tar.xz | |
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
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3101-ls-tree-dirname.sh | 6 | ||||
| -rwxr-xr-x | t/t4010-diff-pathspec.sh | 8 |
2 files changed, 14 insertions, 0 deletions
diff --git a/t/t3101-ls-tree-dirname.sh b/t/t3101-ls-tree-dirname.sh index 4dd7d12ba..51cb4a30f 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 9322298ec..94df7ae53 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 |