diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-01-27 18:45:43 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-01-27 18:45:44 (GMT) |
| commit | 017f804efc47234682fb0103a51ac453d96c56c1 (patch) | |
| tree | be9f50bd1d08e45bde01e5694dbcdd5c33e75dc1 /t | |
| parent | 523f0a25b91c34ec817bc5757f52f365f497e3bb (diff) | |
| parent | 74b4f7f27736f3e196a4eb3db41c68e37a6e2160 (diff) | |
| download | git-017f804efc47234682fb0103a51ac453d96c56c1.zip git-017f804efc47234682fb0103a51ac453d96c56c1.tar.gz git-017f804efc47234682fb0103a51ac453d96c56c1.tar.bz2 | |
Merge branch 'nd/negative-pathspec'
* nd/negative-pathspec:
tree-walk.c: ignore trailing slash on submodule in tree_entry_interesting()
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4010-diff-pathspec.sh | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/t/t4010-diff-pathspec.sh b/t/t4010-diff-pathspec.sh index af5134b..15a4912 100755 --- a/t/t4010-diff-pathspec.sh +++ b/t/t4010-diff-pathspec.sh @@ -110,4 +110,21 @@ test_expect_success 'diff-tree -r with wildcard' ' 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_done |