mirror of
https://github.com/git/git
synced 2024-10-30 04:01:21 +00:00
aa06180ac9
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>
19 lines
463 B
Bash
Executable file
19 lines
463 B
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='read-tree can handle submodules'
|
|
|
|
. ./test-lib.sh
|
|
. "$TEST_DIRECTORY"/lib-submodule-update.sh
|
|
|
|
KNOWN_FAILURE_DIRECTORY_SUBMODULE_CONFLICTS=1
|
|
KNOWN_FAILURE_SUBMODULE_OVERWRITE_IGNORED_UNTRACKED=1
|
|
|
|
test_submodule_switch_recursing_with_args "read-tree -u -m"
|
|
|
|
test_submodule_forced_switch_recursing_with_args "read-tree -u --reset"
|
|
|
|
test_submodule_switch "read-tree -u -m"
|
|
|
|
test_submodule_forced_switch "read-tree -u --reset"
|
|
|
|
test_done
|