efafdca421
The effort to avoid using test_must_fail on non-git command continues. * dl/test-must-fail-fixes-5: lib-submodule-update: pass 'test_must_fail' as an argument lib-submodule-update: prepend "git" to $command lib-submodule-update: consolidate --recurse-submodules lib-submodule-update: add space after function name
22 lines
476 B
Bash
Executable File
22 lines
476 B
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='reset 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 "reset --keep"
|
|
|
|
test_submodule_forced_switch_recursing_with_args "reset --hard"
|
|
|
|
test_submodule_switch "reset --keep"
|
|
|
|
test_submodule_switch "reset --merge"
|
|
|
|
test_submodule_forced_switch "reset --hard"
|
|
|
|
test_done
|