diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-04-24 05:07:57 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-04-24 05:07:57 (GMT) |
commit | 2d646e3e1fd0ae7f525034abee73d06ac8946729 (patch) | |
tree | f3be44131af79184a4c5647c9b41ddd915d86a8f /t | |
parent | f9096db54b29ed17afc6e3393f159ea55142b14c (diff) | |
parent | 2cfe66a8ee57fb3da18c262db8e6df95e263510b (diff) | |
download | git-2d646e3e1fd0ae7f525034abee73d06ac8946729.zip git-2d646e3e1fd0ae7f525034abee73d06ac8946729.tar.gz git-2d646e3e1fd0ae7f525034abee73d06ac8946729.tar.bz2 |
Merge branch 'jk/ls-files-recurse-submodules-fix'
"ls-files --recurse-submodules" did not quite work well in a
project with nested submodules.
* jk/ls-files-recurse-submodules-fix:
ls-files: fix path used when recursing into submodules
ls-files: fix recurse-submodules with nested submodules
Diffstat (limited to 't')
-rwxr-xr-x | t/t3007-ls-files-recurse-submodules.sh | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/t/t3007-ls-files-recurse-submodules.sh b/t/t3007-ls-files-recurse-submodules.sh index 4cf6ccf..ebb956f 100755 --- a/t/t3007-ls-files-recurse-submodules.sh +++ b/t/t3007-ls-files-recurse-submodules.sh @@ -77,10 +77,22 @@ test_expect_success 'ls-files recurses more than 1 level' ' git -C submodule/subsub commit -m "add d" && git -C submodule submodule add ./subsub && git -C submodule commit -m "added subsub" && + git submodule absorbgitdirs && git ls-files --recurse-submodules >actual && test_cmp expect actual ' +test_expect_success 'ls-files works with GIT_DIR' ' + cat >expect <<-\EOF && + .gitmodules + c + subsub/d + EOF + + git --git-dir=submodule/.git ls-files --recurse-submodules >actual && + test_cmp expect actual +' + test_expect_success '--recurse-submodules and pathspecs setup' ' echo e >submodule/subsub/e.txt && git -C submodule/subsub add e.txt && |