From: Jeff King <peff@peff.net>
Date: Tue, 1 Dec 2015 22:24:20 +0000 (-0500)
Subject: Merge branch 'eg/p4-submit-catch-failure' into maint
X-Git-Tag: v2.6.4~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=908a6e4156dff47d4877478383fd4b79592010e2;p=thirdparty%2Fgit.git

Merge branch 'eg/p4-submit-catch-failure' into maint

Just like the working tree is cleaned up when the user cancelled
submission in P4Submit.applyCommit(), clean up the mess if "p4
submit" fails.

* eg/p4-submit-catch-failure:
  git-p4: clean up after p4 submit failure
---

908a6e4156dff47d4877478383fd4b79592010e2