OSDN Git Service

Merge branch 'eg/p4-submit-catch-failure' into maint
authorJeff King <peff@peff.net>
Tue, 1 Dec 2015 22:24:20 +0000 (17:24 -0500)
committerJeff King <peff@peff.net>
Tue, 1 Dec 2015 22:24:21 +0000 (17:24 -0500)
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

1  2 
git-p4.py

diff --cc git-p4.py
Simple merge