| commit | 5a41c16a81927bbccbcb00895b168a6d560b8c2c | |
| author | Pete Wyckoff <pw@padd.com> | |
| Sun, 9 Sep 2012 20:16:06 +0000 (9 16:16 -0400) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 17 Sep 2012 04:52:52 +0000 (16 21:52 -0700) | ||
| tree | e6c01bfc94665eef12eebf6b915f595bfcbdf694 | treesnapshot (tar.gz zip) |
| parent | 7e5dd9f2ccf2141d65e4621b765a136796b0d55b | commitdiff |
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>
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>
| git-p4.py | diffblobblamehistory | |
| t/t9805-git-p4-skip-submit-edit.sh | diffblobblamehistory |