diff options
| author | Jeff King <peff@peff.net> | 2015-12-01 17:24:20 -0500 |
|---|---|---|
| committer | Jeff King <peff@peff.net> | 2015-12-01 17:24:21 -0500 |
| commit | 908a6e4156dff47d4877478383fd4b79592010e2 (patch) | |
| tree | 45acf663340425d6a54935a03af868152e1b9a34 /t/t9807-git-p4-submit.sh | |
| parent | 35f263545ce853cd3e250a67cdb3c77534343239 (diff) | |
| parent | b7638fed427f4aab36ad8ff36fe06f0e4b5c98e4 (diff) | |
| download | git-908a6e4156dff47d4877478383fd4b79592010e2.tar.gz git-908a6e4156dff47d4877478383fd4b79592010e2.tar.xz | |
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
Diffstat (limited to 't/t9807-git-p4-submit.sh')
| -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 1f74a8838..593152817 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 ) ' |