diff options
| author |  Brandon Williams <bmwill@google.com> | 2016-11-17 10:46:04 -0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2016-11-23 08:39:14 -0800 |
| commit | 0301c821c5cd124733accfbff0ddbf7f0b0ee9fb (patch) | |
| tree | b41edb26a5a5e4b91b24124bec9c0df067e2be19 /t | |
| parent | push: --dry-run updates submodules when --recurse-submodules=on-demand (diff) | |
| download | tgif-0301c821c5cd124733accfbff0ddbf7f0b0ee9fb.tar.xz | |
push: fix --dry-run to not push submodules
Teach push to respect the --dry-run option when configured to
recursively push submodules 'on-demand'. This is done by passing the
--dry-run flag to the child process which performs a push for a
submodules when performing a dry-run.
In order to preserve good user experience, the additional check for
unpushed submodules is skipped during a dry-run when
--recurse-submodules=on-demand. The check is skipped because the submodule
pushes were performed as dry-runs and this check would always fail as the
submodules would still need to be pushed.
Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t5531-deep-submodule-push.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t5531-deep-submodule-push.sh b/t/t5531-deep-submodule-push.sh index 7840032ba8..1524ff5ba6 100755 --- a/t/t5531-deep-submodule-push.sh +++ b/t/t5531-deep-submodule-push.sh @@ -431,7 +431,7 @@ test_expect_success 'push unpushable submodule recursively fails' ' test_cmp expected actual ' -test_expect_failure 'push --dry-run does not recursively update submodules' ' +test_expect_success 'push --dry-run does not recursively update submodules' ' ( cd work/gar/bage && git checkout master && |