diff options
| author |  Johannes Schindelin <johannes.schindelin@gmx.de> | 2016-10-21 14:25:17 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2016-10-21 09:32:34 -0700 |
| commit | 9240beda621dc0b4eec66f5ad9a8258c0f614e4c (patch) | |
| tree | 62e1a92488767ed84aeb8fe30fd44082619b0d95 | |
| parent | sequencer: allow editing the commit message on a case-by-case basis (diff) | |
| download | tgif-9240beda621dc0b4eec66f5ad9a8258c0f614e4c.tar.xz | |
sequencer: support amending commits
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | sequencer.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sequencer.c b/sequencer.c index c0a0aa0ed6..1ef50a0999 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); |