diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-12-05 20:52:47 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-12-05 20:52:47 (GMT) |
| commit | 88cf80949e0a4c3cacd4be80358e5fe62acbf0ae (patch) | |
| tree | 7a914b9459e5684c1976a75cebb38c413007afce /t/t7400-submodule-basic.sh | |
| parent | 8feb47e8824e16c0913028a59cfaa6d76fc9f209 (diff) | |
| parent | 1f3aea22c781d603d56ce794879a8fe8d8dd77d1 (diff) | |
| download | git-88cf80949e0a4c3cacd4be80358e5fe62acbf0ae.zip git-88cf80949e0a4c3cacd4be80358e5fe62acbf0ae.tar.gz git-88cf80949e0a4c3cacd4be80358e5fe62acbf0ae.tar.bz2 | |
Merge branch 'mg/submodule-status-from-a-subdirectory'
"git submodule status" that is run from a subdirectory of the
superproject did not work well, which has been corrected.
* mg/submodule-status-from-a-subdirectory:
submodule: fix 'submodule status' when called from a subdirectory
Diffstat (limited to 't/t7400-submodule-basic.sh')
| -rwxr-xr-x | t/t7400-submodule-basic.sh | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh index 691b5fc..7f75bb1 100755 --- a/t/t7400-submodule-basic.sh +++ b/t/t7400-submodule-basic.sh @@ -356,6 +356,28 @@ test_expect_success 'status should only print one line' ' test_line_count = 1 lines ' +test_expect_success 'status from subdirectory should have the same SHA1' ' + test_when_finished "rmdir addtest/subdir" && + ( + cd addtest && + mkdir subdir && + git submodule status >output && + awk "{print \$1}" <output >expect && + cd subdir && + git submodule status >../output && + awk "{print \$1}" <../output >../actual && + test_cmp ../expect ../actual && + git -C ../submod checkout HEAD^ && + git submodule status >../output && + awk "{print \$1}" <../output >../actual2 && + cd .. && + git submodule status >output && + awk "{print \$1}" <output >expect2 && + test_cmp expect2 actual2 && + ! test_cmp actual actual2 + ) +' + test_expect_success 'setup - fetch commit name from submodule' ' rev1=$(cd .subrepo && git rev-parse HEAD) && printf "rev1: %s\n" "$rev1" && |