diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-04-18 22:47:59 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-18 22:47:59 +0400 |
| commit | 54a3c67375384a38eae946b7996d226dbd9c26d4 (patch) | |
| tree | 3fcd52b8f8152dc87adb83469e755b205aaee82c /t/t7406-submodule-update.sh | |
| parent | 8dd28584a5fe737ca373315f47055f3df2260606 (diff) | |
| parent | ac47a22a7a3c01d38b39c6896a1965ac0b9c473d (diff) | |
Merge branch 'jc/push-2.0-default-to-simple' (early part)
Adjust our tests for upcoming migration of the default value for the
"push.default" configuration variable to "simple" from "mixed".
* 'jc/push-2.0-default-to-simple' (early part):
t5570: do not assume the "matching" push is the default
t5551: do not assume the "matching" push is the default
t5550: do not assume the "matching" push is the default
t9401: do not assume the "matching" push is the default
t9400: do not assume the "matching" push is the default
t7406: do not assume the "matching" push is the default
t5531: do not assume the "matching" push is the default
t5519: do not assume the "matching" push is the default
t5517: do not assume the "matching" push is the default
t5516: do not assume the "matching" push is the default
t5505: do not assume the "matching" push is the default
t5404: do not assume the "matching" push is the default
Diffstat (limited to 't/t7406-submodule-update.sh')
| -rwxr-xr-x | t/t7406-submodule-update.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh index 2a0cfaac32..a4ffea0dbe 100755 --- a/t/t7406-submodule-update.sh +++ b/t/t7406-submodule-update.sh @@ -596,14 +596,14 @@ test_expect_success 'submodule add places git-dir in superprojects git-dir recur git log > ../../../expected ) && git commit -m "added subsubmodule" && - git push + git push origin : ) && (cd .git/modules/deeper/submodule/modules/subsubmodule && git log > ../../../../../actual ) && git add deeper/submodule && git commit -m "update submodule" && - git push && + git push origin : && test_cmp actual expected ) ' |