summaryrefslogtreecommitdiff
path: root/contrib/examples/git-rerere.perl
diff options
context:
space:
mode:
authorLibravatar Jens Lehmann <Jens.Lehmann@web.de>2014-06-19 22:12:54 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-07-14 12:06:16 -0700
commitda7fe3fb6d810507bef586e76a01bb34758d4472 (patch)
treed793ca7dd731958d727be4a2de7e804b6081febd /contrib/examples/git-rerere.perl
parentam: add t4255 for submodule updates (diff)
downloadtgif-da7fe3fb6d810507bef586e76a01bb34758d4472.tar.xz
stash: add t3906 for submodule updates
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>
Diffstat (limited to 'contrib/examples/git-rerere.perl')
0 files changed, 0 insertions, 0 deletions