]> git.ipfire.org Git - thirdparty/git.git/commit - git-p4.py
git-p4: clean up after p4 submit failure
authorGIRARD Etienne <egirard@murex.com>
Tue, 24 Nov 2015 07:43:59 +0000 (07:43 +0000)
committerJeff King <peff@peff.net>
Tue, 24 Nov 2015 20:41:59 +0000 (15:41 -0500)
commitb7638fed427f4aab36ad8ff36fe06f0e4b5c98e4
tree27de79275927084482900b82eaac2315b0e7660d
parentb05c2f9ed48adfd9670b28ecdd5c55a4e4698704
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>
git-p4.py
t/t9807-git-p4-submit.sh