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/t5100/patch0015--no-inbody-headers | |
| parent | git p4: move conflict prompt into run, add [q]uit input (diff) | |
| download | tgif-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/t5100/patch0015--no-inbody-headers')
0 files changed, 0 insertions, 0 deletions