sequencer: simplify handing of fixup with conflicts

Commit e032abd5a0 (rebase: fix rewritten list for failed pick,
2023-09-06) introduced an early return when res == -1, so if we enter
this conditional block then res is positive. After the last couple
of commits the only possible positive value is 1 so we can simplify
the code by removing the conditional call to intend_to_amend() and
call it error_with_patch() instead.

Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/sequencer.c b/sequencer.c
index 39cbb7b6e3e20a64a3482ed0222cae50c291f027..bcfbda018a7843208c7dec074215a268865ef6ff 100644 (file)
--- a/sequencer.c
+++ b/sequencer.c
@@ -3874,7 +3874,7 @@ static int error_failed_squash(struct repository *r,
                return error(_("could not copy '%s' to '%s'"),
                             rebase_path_message(),
                             git_path_merge_msg(r));
-       return error_with_patch(r, commit, subject, subject_len, opts, 1, 0);
+       return error_with_patch(r, commit, subject, subject_len, opts, 1, 1);
 }
 
 static int do_exec(struct repository *r, const char *command_line, int quiet)
@@ -4986,8 +4986,6 @@ static int pick_one_commit(struct repository *r,
                record_in_rewritten(&item->commit->object.oid,
                                    peek_command(todo_list, 1));
        if (res && is_fixup(item->command)) {
-               if (res == 1)
-                       intend_to_amend();
                return error_failed_squash(r, item->commit, opts,
                                           item->arg_len, arg);
        } else if (res && is_rebase_i(opts) && item->commit) {