sequencer (rebase -i): set the reflog message consistently
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Schindelin committed
Jan 2, 2017 at 16:28 UTC
8ab37ef21f9c48bf034128523c489b4f39bcbb88
1 file changed
+4
sequencer.c
+4
@@ -1785,6 +1785,10 @@ static int pick_commits(struct todo_list *todo_list, struct replay_opts *opts)
1785
unlink(rebase_path_amend());
1786
}
1787
if (item->command <= TODO_SQUASH) {
1788
+ if (is_rebase_i(opts))
1789
+ setenv("GIT_REFLOG_ACTION", reflog_message(opts,
1790
+ command_to_string(item->command), NULL),
1791
+ 1);
1792
res = do_pick_commit(item->command, item->commit,
1793
opts, is_final_fixup(todo_list));
1794
if (item->command == TODO_EDIT) {