projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 35f2635 b7638fe)
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)
commit908a6e4156dff47d4877478383fd4b79592010e2
tree45acf663340425d6a54935a03af868152e1b9a34tree | snapshot
parent35f263545ce853cd3e250a67cdb3c77534343239commit | diff
parentb7638fed427f4aab36ad8ff36fe06f0e4b5c98e4commit | diff
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
git-p4.py diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.