diff options
| -rw-r--r-- | sequencer.c | 4 |
1 files changed, 3 insertions, 1 deletions
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; |