diff options
author | Denton Liu <liu.denton@gmail.com> | 2020-06-11 13:41:49 -0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-06-12 11:33:40 -0700 |
commit | aa06180ac90984204e59ac74bb4e3a4d09037ac2 (patch) | |
tree | d2754694324423c5904f60990d702826b3721ff0 /t/t7112-reset-submodule.sh | |
parent | lib-submodule-update: consolidate --recurse-submodules (diff) | |
download | tgif-aa06180ac90984204e59ac74bb4e3a4d09037ac2.tar.xz |
lib-submodule-update: prepend "git" to $command
Since all invocations of test_submodule_forced_switch() are git
commands, automatically prepend "git" before invoking
test_submodule_switch_common().
Similarly, many invocations of test_submodule_switch() are also git
commands so automatically prepend "git" before invoking
test_submodule_switch_common() as well.
Finally, for invocations of test_submodule_switch() that invoke a custom
function, rename the old function to test_submodule_switch_func().
This is necessary because in a future commit, we will be adding some
logic that needs to distinguish between an invocation of a plain git
comamnd and an invocation of a test helper function.
Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7112-reset-submodule.sh')
-rwxr-xr-x | t/t7112-reset-submodule.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t7112-reset-submodule.sh b/t/t7112-reset-submodule.sh index a1cb9ff858..8741b665c9 100755 --- a/t/t7112-reset-submodule.sh +++ b/t/t7112-reset-submodule.sh @@ -13,10 +13,10 @@ test_submodule_switch_recursing_with_args "reset --keep" test_submodule_forced_switch_recursing_with_args "reset --hard" -test_submodule_switch "git reset --keep" +test_submodule_switch "reset --keep" -test_submodule_switch "git reset --merge" +test_submodule_switch "reset --merge" -test_submodule_forced_switch "git reset --hard" +test_submodule_forced_switch "reset --hard" test_done |