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/t7613-merge-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/t7613-merge-submodule.sh')
-rwxr-xr-x | t/t7613-merge-submodule.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/t/t7613-merge-submodule.sh b/t/t7613-merge-submodule.sh index d1e9fcc781..04bf4be7d7 100755 --- a/t/t7613-merge-submodule.sh +++ b/t/t7613-merge-submodule.sh @@ -6,14 +6,14 @@ test_description='merge can handle submodules' . "$TEST_DIRECTORY"/lib-submodule-update.sh # merges without conflicts -test_submodule_switch "git merge" +test_submodule_switch "merge" -test_submodule_switch "git merge --ff" +test_submodule_switch "merge --ff" -test_submodule_switch "git merge --ff-only" +test_submodule_switch "merge --ff-only" KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR=1 KNOWN_FAILURE_NOFF_MERGE_ATTEMPTS_TO_MERGE_REMOVED_SUBMODULE_FILES=1 -test_submodule_switch "git merge --no-ff" +test_submodule_switch "merge --no-ff" test_done |