summaryrefslogtreecommitdiff
path: root/t/t1013-read-tree-submodule.sh
AgeCommit message (Collapse)AuthorFilesLines
2017-03-16builtin/read-tree: add --recurse-submodules switchLibravatar Stefan Beller1-0/+8
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>
2014-07-14read-tree: add t1013 for submodule updatesLibravatar Jens Lehmann1-0/+12
Test that the read-tree command updates the work tree as expected for changes which don't result in conflicts with the '-m' and '--reset' flag. Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>