summaryrefslogtreecommitdiff
path: root/t/t6038-merge-text-auto.sh
diff options
context:
space:
mode:
authorLibravatar GIRARD Etienne <egirard@murex.com>2015-11-24 07:43:59 +0000
committerLibravatar Jeff King <peff@peff.net>2015-11-24 15:41:59 -0500
commitb7638fed427f4aab36ad8ff36fe06f0e4b5c98e4 (patch)
tree27de79275927084482900b82eaac2315b0e7660d /t/t6038-merge-text-auto.sh
parentMerge branch 'js/gc-with-stale-symref' into maint (diff)
downloadtgif-b7638fed427f4aab36ad8ff36fe06f0e4b5c98e4.tar.xz
git-p4: clean up after p4 submit failure
When "p4 submit" command fails in P4Submit.applyCommit, the workspace is left with the changes. We already have code to revert the changes to the workspace when the user decides to cancel submission by aborting the editor that edits the change description, and we should treat the "p4 submit" failure the same way. Clean the workspace if p4_write_pipe raised SystemExit, so that the user don't have to do it themselves. Signed-off-by: GIRARD Etienne <egirard@murex.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Luke Diamand <luke@diamand.org> Signed-off-by: Jeff King <peff@peff.net>
Diffstat (limited to 't/t6038-merge-text-auto.sh')
0 files changed, 0 insertions, 0 deletions