diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-12-16 15:27:48 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-12-16 15:27:48 -0800 |
| commit | 12cf1135df64ae2a94e6146f96fdb963d2ee152e (patch) | |
| tree | 740e28ea6e2d953c5cdc5b709cfeafad3f0c3543 /t | |
| parent | Merge branch 'hv/submodule-not-yet-pushed-fix' (diff) | |
| parent | push: fix --dry-run to not push submodules (diff) | |
| download | tgif-12cf1135df64ae2a94e6146f96fdb963d2ee152e.tar.xz | |
Merge branch 'bw/push-dry-run'
"git push --dry-run --recurse-submodule=on-demand" wasn't
"--dry-run" in the submodules.
* bw/push-dry-run:
push: fix --dry-run to not push submodules
push: --dry-run updates submodules when --recurse-submodules=on-demand
Diffstat (limited to 't')
| -rwxr-xr-x | t/t5531-deep-submodule-push.sh | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/t/t5531-deep-submodule-push.sh b/t/t5531-deep-submodule-push.sh index 198ce84754..1524ff5ba6 100755 --- a/t/t5531-deep-submodule-push.sh +++ b/t/t5531-deep-submodule-push.sh @@ -427,7 +427,31 @@ test_expect_success 'push unpushable submodule recursively fails' ' cd submodule.git && git rev-parse master >../actual ) && + test_when_finished git -C work reset --hard master^ && test_cmp expected actual ' +test_expect_success 'push --dry-run does not recursively update submodules' ' + ( + cd work/gar/bage && + git checkout master && + git rev-parse master >../../../expected_submodule && + > junk9 && + git add junk9 && + git commit -m "Ninth junk" && + + # Go up to 'work' directory + cd ../.. && + git checkout master && + git rev-parse master >../expected_pub && + git add gar/bage && + git commit -m "Ninth commit for gar/bage" && + git push --dry-run --recurse-submodules=on-demand ../pub.git master + ) && + git -C submodule.git rev-parse master >actual_submodule && + git -C pub.git rev-parse master >actual_pub && + test_cmp expected_pub actual_pub && + test_cmp expected_submodule actual_submodule +' + test_done |