diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2007-09-09 02:32:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-09-09 02:32:24 -0700 |
| commit | 57543a254c6aef8fca5556e25a9fa6dd5622b037 (patch) | |
| tree | 022b6895b107d5c81e6b9a4f211c06ca5f1c17c0 /t | |
| parent | git-rebase: fix -C option (diff) | |
| parent | git-svn: understand grafts when doing dcommit (diff) | |
| download | tgif-57543a254c6aef8fca5556e25a9fa6dd5622b037.tar.xz | |
Merge branch 'maint'
* maint:
git-svn: understand grafts when doing dcommit
git-diff: don't squelch the new SHA1 in submodule diffs
git-svn: fix "Malformed network data" with svn:// servers
(cvs|svn)import: Ask git-tag to overwrite old tags.
Documentation / grammer nit
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7400-submodule-basic.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh index 9d142ed649..4fe3a41f07 100755 --- a/t/t7400-submodule-basic.sh +++ b/t/t7400-submodule-basic.sh @@ -152,6 +152,10 @@ test_expect_success 'the --cached sha1 should be rev1' ' git-submodule --cached status | grep "^+$rev1" ' +test_expect_success 'git diff should report the SHA1 of the new submodule commit' ' + git-diff | grep "^+Subproject commit $rev2" +' + test_expect_success 'update should checkout rev1' ' git-submodule update && head=$(cd lib && git rev-parse HEAD) && |