mirror of
https://github.com/git/git
synced 2024-08-28 12:09:19 +00:00
25804914fa
A new known failure mode is introduced[1], which is actually not a failure but a feature in read-tree. Unlike checkout for which the recursive submodule tests were originally written, read-tree does warn about ignored untracked files that would be overwritten. For the sake of keeping the test library for submodules generic, just mark the test as a failure. [1] KNOWN_FAILURE_SUBMODULE_OVERWRITE_IGNORED_UNTRACKED Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
21 lines
544 B
Bash
Executable file
21 lines
544 B
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='read-tree 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 "git read-tree --recurse-submodules -u -m"
|
|
|
|
test_submodule_forced_switch_recursing "git read-tree --recurse-submodules -u --reset"
|
|
|
|
test_submodule_switch "git read-tree -u -m"
|
|
|
|
test_submodule_forced_switch "git read-tree -u --reset"
|
|
|
|
test_done
|