From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Mon, 2 Jan 2017 15:28:13 +0000 (+0100)
Subject: sequencer (rebase -i): set the reflog message consistently
X-Git-Tag: v2.12.0-rc0~38^2~16
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8ab37ef21f9c48bf034128523c489b4f39bcbb88

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>
---

diff --git a/sequencer.c b/sequencer.c
index 0d8e11f580..95ae4bcd1e 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -1785,6 +1785,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) {