]> git.ipfire.org Git - thirdparty/git.git/commit - Documentation/git-read-tree.txt
builtin/read-tree: add --recurse-submodules switch
authorStefan Beller <sbeller@google.com>
Tue, 14 Mar 2017 21:46:42 +0000 (14:46 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 16 Mar 2017 21:07:16 +0000 (14:07 -0700)
commit25804914fa3661549cb4017fd0d127b9b626fc69
tree5262186d86d313cb0a66b369504f7f3d04212ccb
parent1fc458d958be0e8347d7704933ae647afeabcd91
builtin/read-tree: add --recurse-submodules switch

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>
Documentation/git-read-tree.txt
builtin/read-tree.c
t/lib-submodule-update.sh
t/t1013-read-tree-submodule.sh