diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-04-18 21:18:32 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-18 21:18:32 (GMT) |
| commit | 08e7239c36a477c52ac83488537600a494002b31 (patch) | |
| tree | 3f0ec5559df41d2d22c86d0aba1415b6f7cb1a44 /t | |
| parent | f3924858133dff1e94c992b689fa425a6d27d4fd (diff) | |
| parent | 8092bfb6c23776d72ce4b38a3b517c3753c3b9fe (diff) | |
| download | git-08e7239c36a477c52ac83488537600a494002b31.zip git-08e7239c36a477c52ac83488537600a494002b31.tar.gz git-08e7239c36a477c52ac83488537600a494002b31.tar.bz2 | |
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-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 4dd7d12..51cb4a3 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 9322298..94df7ae 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 |