diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-06-13 13:26:59 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-13 13:26:59 -0700 |
| commit | 146b0ab1a528b54803adbf8b6b72239a8d68a65c (patch) | |
| tree | 7c8a072edb7acc3203e5ac87b094f5c121f0e186 /t/t1013-read-tree-submodule.sh | |
| parent | Merge branch 'ab/sha1dc-maint' into maint (diff) | |
| parent | submodule: properly recurse for read-tree and checkout (diff) | |
| download | tgif-146b0ab1a528b54803adbf8b6b72239a8d68a65c.tar.xz | |
Merge branch 'sb/checkout-recurse-submodules' into maint
"git checkout --recurse-submodules" did not quite work with a
submodule that itself has submodules.
* sb/checkout-recurse-submodules:
submodule: properly recurse for read-tree and checkout
submodule: avoid auto-discovery in new working tree manipulator code
submodule_move_head: reuse child_process structure for futher commands
Diffstat (limited to 't/t1013-read-tree-submodule.sh')
| -rwxr-xr-x | t/t1013-read-tree-submodule.sh | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/t/t1013-read-tree-submodule.sh b/t/t1013-read-tree-submodule.sh index de1ba02dc5..7019d0a04f 100755 --- a/t/t1013-read-tree-submodule.sh +++ b/t/t1013-read-tree-submodule.sh @@ -5,7 +5,6 @@ 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 |