mirror of
https://github.com/git/git
synced 2024-11-05 18:59:29 +00:00
bd35645be2
The known failure mode KNOWN_FAILURE_SUBMODULE_RECURSIVE_NESTED was removed from lib-submodule-update.sh in218c883783(submodule: properly recurse for read-tree and checkout, 2017-05-02) but at that time this change was not ported over to topic sb/reset-recurse-submodules, such that when this topic was merged in5f074ca7e8(Merge branch 'sb/reset-recurse-submodules', 2017-05-29), t7112-reset-submodules.sh kept a mention of this removed failure mode. Remove it now, as it does not mean anything anymore. Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
21 lines
488 B
Bash
Executable file
21 lines
488 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 "git reset --keep"
|
|
|
|
test_submodule_switch "git reset --merge"
|
|
|
|
test_submodule_forced_switch "git reset --hard"
|
|
|
|
test_done
|