lib-submodule-update: consolidate --recurse-submodules

Both test_submodule_switch_recursing_with_args() and
test_submodule_forced_switch_recursing_with_args() call the internal
function test_submodule_recursing_with_args_common() with the final
argument of `--recurse-submodules`. Consolidate this duplication by
appending the argument in test_submodule_recursing_with_args_common().

Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Denton Liu 2020-04-29 08:22:24 -04:00 committed by Junio C Hamano
parent 27691ca27e
commit add2452348
1 changed files with 3 additions and 3 deletions

View File

@ -630,7 +630,7 @@ test_submodule_forced_switch () {
# Internal function; use test_submodule_switch_recursing_with_args() or # Internal function; use test_submodule_switch_recursing_with_args() or
# test_submodule_forced_switch_recursing_with_args() instead. # test_submodule_forced_switch_recursing_with_args() instead.
test_submodule_recursing_with_args_common () { test_submodule_recursing_with_args_common () {
command="$1" command="$1 --recurse-submodules"


######################### Appearing submodule ######################### ######################### Appearing submodule #########################
# Switching to a commit letting a submodule appear checks it out ... # Switching to a commit letting a submodule appear checks it out ...
@ -809,7 +809,7 @@ test_submodule_recursing_with_args_common () {
# test_submodule_switch_recursing_with_args "$GIT_COMMAND" # test_submodule_switch_recursing_with_args "$GIT_COMMAND"
test_submodule_switch_recursing_with_args () { test_submodule_switch_recursing_with_args () {
cmd_args="$1" cmd_args="$1"
command="git $cmd_args --recurse-submodules" command="git $cmd_args"
test_submodule_recursing_with_args_common "$command" test_submodule_recursing_with_args_common "$command"


RESULTDS=success RESULTDS=success
@ -927,7 +927,7 @@ test_submodule_switch_recursing_with_args () {
# away local changes in the superproject is allowed. # away local changes in the superproject is allowed.
test_submodule_forced_switch_recursing_with_args () { test_submodule_forced_switch_recursing_with_args () {
cmd_args="$1" cmd_args="$1"
command="git $cmd_args --recurse-submodules" command="git $cmd_args"
test_submodule_recursing_with_args_common "$command" test_submodule_recursing_with_args_common "$command"


RESULT=success RESULT=success