diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-07-06 22:09:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-07-06 22:09:18 -0700 |
| commit | efafdca42162843e90cefdeefd8e6c244cee91f5 (patch) | |
| tree | 7cdfdc1a5604687c08b0a606af013d616877b028 /t/t7112-reset-submodule.sh | |
| parent | Merge branch 'jk/fast-export-anonym-alt' (diff) | |
| parent | lib-submodule-update: pass 'test_must_fail' as an argument (diff) | |
| download | git-efafdca42162843e90cefdeefd8e6c244cee91f5.tar.gz git-efafdca42162843e90cefdeefd8e6c244cee91f5.zip | |
Merge branch 'dl/test-must-fail-fixes-5'
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
Diffstat (limited to 't/t7112-reset-submodule.sh')
| -rwxr-xr-x | t/t7112-reset-submodule.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t7112-reset-submodule.sh b/t/t7112-reset-submodule.sh index 67346424a5..19830d9036 100755 --- a/t/t7112-reset-submodule.sh +++ b/t/t7112-reset-submodule.sh @@ -12,10 +12,10 @@ 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 "reset --keep" -test_submodule_switch "git reset --merge" +test_submodule_switch "reset --merge" -test_submodule_forced_switch "git reset --hard" +test_submodule_forced_switch "reset --hard" test_done |