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/t3426-rebase-submodule.sh | |
| parent | add245234820be6cec3f54174d44f738aa1a80f9 (diff) | |
| download | git-aa06180ac90984204e59ac74bb4e3a4d09037ac2.tar.gz | |
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/t3426-rebase-submodule.sh')
| -rwxr-xr-x | t/t3426-rebase-submodule.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t3426-rebase-submodule.sh b/t/t3426-rebase-submodule.sh index a2bba04ba9..788605ccc0 100755 --- a/t/t3426-rebase-submodule.sh +++ b/t/t3426-rebase-submodule.sh @@ -20,7 +20,7 @@ git_rebase () { git rebase "$1" } -test_submodule_switch "git_rebase" +test_submodule_switch_func "git_rebase" git_rebase_interactive () { git status -su >expect && @@ -38,7 +38,7 @@ git_rebase_interactive () { git rebase -i "$1" } -test_submodule_switch "git_rebase_interactive" +test_submodule_switch_func "git_rebase_interactive" test_expect_success 'rebase interactive ignores modified submodules' ' test_when_finished "rm -rf super sub" && |