[PATCH v5 16/27] sequencer: support amending commits
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Oct 21, 2016, 12:25 UTC
- Message-ID
- <6df19ad36240580e8717d4adafaf7b6e039fe2d6.1477052405.git.johannes.schindelin@gmx.de>
- In-Reply-To
- <cover.1477052405.git.johannes.schindelin@gmx.de>
This teaches the run_git_commit() function to take an argument that will allow us to implement "todo" commands that need to amend the commit messages ("fixup", "squash" and "reword").
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> --- sequencer.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/sequencer.c b/sequencer.c index c0a0aa0..1ef50a0 100644 --- a/sequencer.c +++ b/sequencer.c @@ -484,7 +484,7 @@ static char **read_author_script(void) * author metadata. */ static int run_git_commit(const char *defmsg, struct replay_opts *opts, - int allow_empty, int edit) + int allow_empty, int edit, int amend) { char **env = NULL; struct argv_array array; @@ -513,6 +513,8 @@ static int run_git_commit(const char *defmsg, struct replay_opts *opts, argv_array_push(&array, "commit"); argv_array_push(&array, "-n"); + if (amend) + argv_array_push(&array, "--amend"); if (opts->gpg_sign) argv_array_pushf(&array, "-S%s", opts->gpg_sign); if (opts->signoff) @@ -786,7 +788,7 @@ static int do_pick_commit(enum todo_command command, struct commit *commit, } if (!opts->no_commit) res = run_git_commit(opts->edit ? NULL : git_path_merge_msg(), - opts, allow, opts->edit); + opts, allow, opts->edit, 0); leave: free_message(commit, &msg);
-- 2.10.1.583.g721a9e0