diff options
| author | Pete Wyckoff <pw@padd.com> | 2012-09-09 16:16:06 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-16 21:52:52 -0700 |
| commit | 5a41c16a81927bbccbcb00895b168a6d560b8c2c (patch) | |
| tree | e6c01bfc94665eef12eebf6b915f595bfcbdf694 /t | |
| parent | 7e5dd9f2ccf2141d65e4621b765a136796b0d55b (diff) | |
| download | git-5a41c16a81927bbccbcb00895b168a6d560b8c2c.tar.gz git-5a41c16a81927bbccbcb00895b168a6d560b8c2c.tar.xz | |
git p4: standardize submit cancel due to unchanged template
When editing the submit template, if no change was made to it,
git p4 offers a prompt "Submit anyway?". Answering "no" cancels
the submit.
Previously, a "no" answer behaves like a "[s]kip" answer to the
failed-patch prompt, in that it proceeded to try to apply the
rest of the commits. Instead, put users back into the new
"[s]kip / [c]ontinue" loop so that they can decide. This makes
both cases of patch failure behave identically.
The return code of git p4 after a "no" answer is now the same
as that for a "skip" due to failed patch; update a test to
understand this.
Signed-off-by: Pete Wyckoff <pw@padd.com>
Acked-by: Luke Diamand <luke@diamand.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t9805-git-p4-skip-submit-edit.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t9805-git-p4-skip-submit-edit.sh b/t/t9805-git-p4-skip-submit-edit.sh index fb3c8ec12..ff2cc7970 100755 --- a/t/t9805-git-p4-skip-submit-edit.sh +++ b/t/t9805-git-p4-skip-submit-edit.sh @@ -38,7 +38,7 @@ test_expect_success 'no config, unedited, say no' ' cd "$git" && echo line >>file1 && git commit -a -m "change 3 (not really)" && - printf "bad response\nn\n" | git p4 submit && + printf "bad response\nn\n" | test_expect_code 1 git p4 submit && p4 changes //depot/... >wc && test_line_count = 2 wc ) |