[PATCH v2 19/34] sequencer (rebase -i): set the reflog message consistently
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Dec 13, 2016, 15:31 UTC
- Message-ID
- <13e2907524d24f5ab393d0203b50dbcca19e7728.1481642927.git.johannes.schindelin@gmx.de>
- In-Reply-To
- <cover.1481642927.git.johannes.schindelin@gmx.de>
We already used the same reflog message as the scripted version of rebase -i when finishing. With this commit, we do that also for all the commands before that.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> --- sequencer.c | 4 ++++ 1 file changed, 4 insertions(+)
diff --git a/sequencer.c b/sequencer.c index d20efad562..118696f6d3 100644 --- a/sequencer.c +++ b/sequencer.c @@ -1792,6 +1792,10 @@ static int pick_commits(struct todo_list *todo_list, struct replay_opts *opts) unlink(rebase_path_amend()); } if (item->command <= TODO_SQUASH) { + if (is_rebase_i(opts)) + setenv("GIT_REFLOG_ACTION", reflog_message(opts, + command_to_string(item->command), NULL), + 1); res = do_pick_commit(item->command, item->commit, opts, is_final_fixup(todo_list)); if (item->command == TODO_EDIT) {
-- 2.11.0.rc3.windows.1