mirror of
https://github.com/git/git
synced 2024-08-24 02:11:08 +00:00
![Stefan Beller](/assets/img/avatar_default.png)
In a later patch we want to introduce a config option to trigger the submodule recursing by default. As this option should be available and uniform across all commands that deal with submodules we'd want to test for this option in the submodule update library. So instead of calling the whole test set again for "git -c submodule.recurse foo" instead of "git foo --recurse-submodules", we'd only want to introduce one basic test that tests if the option is recognized and respected to not overload the test suite. Change the test functions by taking only the argument and assemble the command inside the test function by embedding the arguments into the command that is "git $arguments --recurse-submodules". It would be nice to do this for all functions in lib-submodule-update, but we cannot do that for the non-recursing tests, as there we do not just pass in a git command but whole functions. (See t3426 for example) Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
23 lines
531 B
Bash
Executable file
23 lines
531 B
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='reset can handle submodules'
|
|
|
|
. ./test-lib.sh
|
|
. "$TEST_DIRECTORY"/lib-submodule-update.sh
|
|
|
|
KNOWN_FAILURE_SUBMODULE_RECURSIVE_NESTED=1
|
|
KNOWN_FAILURE_DIRECTORY_SUBMODULE_CONFLICTS=1
|
|
KNOWN_FAILURE_SUBMODULE_OVERWRITE_IGNORED_UNTRACKED=1
|
|
|
|
test_submodule_switch_recursing_with_args "reset --keep"
|
|
|
|
test_submodule_forced_switch_recursing_with_args "reset --hard"
|
|
|
|
test_submodule_switch "git reset --keep"
|
|
|
|
test_submodule_switch "git reset --merge"
|
|
|
|
test_submodule_forced_switch "git reset --hard"
|
|
|
|
test_done
|