diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-03-27 00:11:20 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-03-27 00:11:20 (GMT) |
| commit | fe870600fe2735782e9e8a8c5441f91b1a58e273 (patch) | |
| tree | 9de44bb368d796cf8ff0bbe41a7c8fae52a4904a /t/t7112-reset-submodule.sh | |
| parent | a7d14a44285d3ec4b25bf9e3b7df701221350661 (diff) | |
| parent | 846f34d3514b81764dea7c2a4851f6187ab31aad (diff) | |
| download | git-fe870600fe2735782e9e8a8c5441f91b1a58e273.zip git-fe870600fe2735782e9e8a8c5441f91b1a58e273.tar.gz git-fe870600fe2735782e9e8a8c5441f91b1a58e273.tar.bz2 | |
Merge branch 'pb/recurse-submodules-fix'
Fix "git checkout --recurse-submodules" of a nested submodule
hierarchy.
* pb/recurse-submodules-fix:
t/lib-submodule-update: add test removing nested submodules
unpack-trees: check for missing submodule directory in merged_entry
unpack-trees: remove outdated description for verify_clean_submodule
t/lib-submodule-update: move a test to the right section
t/lib-submodule-update: remove outdated test description
t7112: remove mention of KNOWN_FAILURE_SUBMODULE_RECURSIVE_NESTED
Diffstat (limited to 't/t7112-reset-submodule.sh')
| -rwxr-xr-x | t/t7112-reset-submodule.sh | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/t/t7112-reset-submodule.sh b/t/t7112-reset-submodule.sh index a1cb9ff..6734642 100755 --- a/t/t7112-reset-submodule.sh +++ b/t/t7112-reset-submodule.sh @@ -5,7 +5,6 @@ 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 |