sequencer: drop repository argument from run_git_commit()

When we switched to using an external git-commit call in b0a3186140
(sequencer: simplify root commit creation, 2019-08-19), this function
didn't need to care about the repository object any more.

Arguably we could be passing along the repository path to the external
git-commit by using "--git-dir=r->path" here. But for the most part the
sequencer code relies on sub-process finding the same repository we're
already in (using the same environment variables or discovery process we
did). But we don't have a convenient interface for doing so, and there's
no indication that we need to. Let's just drop the unused parameter for
now.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/sequencer.c b/sequencer.c
index e8676e965fca6813d49cb4b30cc4fab5b8da3390..6e9aabaac16c46ced6afe6586147fd4f661cdcbb 100644 (file)
--- a/sequencer.c
+++ b/sequencer.c
@@ -934,8 +934,7 @@ static int run_command_silent_on_success(struct child_process *cmd)
  * interactive rebase: in that case, we will want to retain the
  * author metadata.
  */
-static int run_git_commit(struct repository *r,
-                         const char *defmsg,
+static int run_git_commit(const char *defmsg,
                          struct replay_opts *opts,
                          unsigned int flags)
 {
@@ -1545,7 +1544,7 @@ static int do_commit(struct repository *r,
                if (is_rebase_i(opts) && oid)
                        if (write_rebase_head(oid))
                            return -1;
-               return run_git_commit(r, msg_file, opts, flags);
+               return run_git_commit(msg_file, opts, flags);
        }
 
        return res;
@@ -2060,7 +2059,7 @@ static int do_pick_commit(struct repository *r,
                *check_todo = !!(flags & EDIT_MSG);
                if (!res && reword) {
 fast_forward_edit:
-                       res = run_git_commit(r, NULL, opts, EDIT_MSG |
+                       res = run_git_commit(NULL, opts, EDIT_MSG |
                                             VERIFY_MSG | AMEND_MSG |
                                             (flags & ALLOW_EMPTY));
                        *check_todo = 1;
@@ -3748,7 +3747,7 @@ static int do_merge(struct repository *r,
                 * command needs to be rescheduled).
                 */
        fast_forward_edit:
-               ret = !!run_git_commit(r, git_path_merge_msg(r), opts,
+               ret = !!run_git_commit(git_path_merge_msg(r), opts,
                                       run_commit_flags);
 
 leave_merge:
@@ -4437,7 +4436,7 @@ static int commit_staged_changes(struct repository *r,
                        return 0;
        }
 
-       if (run_git_commit(r, final_fixup ? NULL : rebase_path_message(),
+       if (run_git_commit(final_fixup ? NULL : rebase_path_message(),
                           opts, flags))
                return error(_("could not commit staged changes."));
        unlink(rebase_path_amend());