diff options
| author | GIRARD Etienne <egirard@murex.com> | 2015-11-24 07:43:59 (GMT) |
|---|---|---|
| committer | Jeff King <peff@peff.net> | 2015-11-24 20:41:59 (GMT) |
| commit | b7638fed427f4aab36ad8ff36fe06f0e4b5c98e4 (patch) | |
| tree | 27de79275927084482900b82eaac2315b0e7660d /t | |
| parent | b05c2f9ed48adfd9670b28ecdd5c55a4e4698704 (diff) | |
| download | git-b7638fed427f4aab36ad8ff36fe06f0e4b5c98e4.zip git-b7638fed427f4aab36ad8ff36fe06f0e4b5c98e4.tar.gz git-b7638fed427f4aab36ad8ff36fe06f0e4b5c98e4.tar.bz2 | |
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')
| -rwxr-xr-x | t/t9807-git-p4-submit.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t9807-git-p4-submit.sh b/t/t9807-git-p4-submit.sh index 1f74a88..5931528 100755 --- a/t/t9807-git-p4-submit.sh +++ b/t/t9807-git-p4-submit.sh @@ -389,7 +389,7 @@ test_expect_success 'description with Jobs section and bogus following text' ' ( cd "$cli" && p4 revert desc6 && - rm desc6 + rm -f desc6 ) ' |