summaryrefslogtreecommitdiff
path: root/t/t3906-stash-submodule.sh
AgeCommit message (Collapse)AuthorFilesLines
2014-07-14stash: add t3906 for submodule updatesLibravatar Jens Lehmann1-0/+24
Test that the stash apply command updates the work tree as expected for changes which don't result in conflicts. To make that work add a helper function that uses read-tree to apply the changes of the target commit to the work tree, then stashes these changes and at last applies that stash. Implement the KNOWN_FAILURE_STASH_DOES_IGNORE_SUBMODULE_CHANGES switch and reuse two other already present switches to expect the known failure that stash does ignore submodule changes. Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>