diff options
| author | Denton Liu <liu.denton@gmail.com> | 2020-06-11 19:41:49 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-06-12 20:33:40 +0200 |
| commit | aa06180ac90984204e59ac74bb4e3a4d09037ac2 (patch) | |
| tree | d2754694324423c5904f60990d702826b3721ff0 /t/t4137-apply-submodule.sh | |
| parent | lib-submodule-update: consolidate --recurse-submodules (diff) | |
| download | git-aa06180ac90984204e59ac74bb4e3a4d09037ac2.tar.xz git-aa06180ac90984204e59ac74bb4e3a4d09037ac2.zip | |
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/t4137-apply-submodule.sh')
| -rwxr-xr-x | t/t4137-apply-submodule.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t4137-apply-submodule.sh b/t/t4137-apply-submodule.sh index a9bd40a6d0..b645e303a0 100755 --- a/t/t4137-apply-submodule.sh +++ b/t/t4137-apply-submodule.sh @@ -9,12 +9,12 @@ apply_index () { git diff --ignore-submodules=dirty "..$1" | git apply --index - } -test_submodule_switch "apply_index" +test_submodule_switch_func "apply_index" apply_3way () { git diff --ignore-submodules=dirty "..$1" | git apply --3way - } -test_submodule_switch "apply_3way" +test_submodule_switch_func "apply_3way" test_done |