[PATCH v3 18/38] sequencer (rebase -i): leave a patch upon error
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Jan 2, 2017, 15:27 UTC
- Message-ID
- <59d8be697e7fc27caf255c1bc5c089752694e29c.1483370556.git.johannes.schindelin@gmx.de>
- In-Reply-To
- <cover.1483370556.git.johannes.schindelin@gmx.de>
When doing an interactive rebase, we want to leave a 'patch' file for further inspection by the user (even if we never tried to actually apply that patch, since we're cherry-picking instead).
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> --- sequencer.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/sequencer.c b/sequencer.c index 80b2b2a975..a2002f1c12 100644 --- a/sequencer.c +++ b/sequencer.c @@ -1769,7 +1769,9 @@ static int pick_commits(struct todo_list *todo_list, struct replay_opts *opts) intend_to_amend(); return error_failed_squash(item->commit, opts, item->arg_len, item->arg); - } + } else if (res && is_rebase_i(opts)) + return res | error_with_patch(item->commit, + item->arg, item->arg_len, opts, res, 0); } else if (item->command == TODO_EXEC) { char *end_of_arg = (char *)(item->arg + item->arg_len); int saved = *end_of_arg;
-- 2.11.0.rc3.windows.1