diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2017-01-02 15:28:13 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-01-09 22:57:30 (GMT) |
| commit | 8ab37ef21f9c48bf034128523c489b4f39bcbb88 (patch) | |
| tree | a061c7b1cd838dcdb5bd3d1f298d1b50fd2e70de /sequencer.c | |
| parent | 96e832a5fd6a97f8d40d89d4c1e97e7e3534edf0 (diff) | |
| download | git-8ab37ef21f9c48bf034128523c489b4f39bcbb88.zip git-8ab37ef21f9c48bf034128523c489b4f39bcbb88.tar.gz git-8ab37ef21f9c48bf034128523c489b4f39bcbb88.tar.bz2 | |
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>
Diffstat (limited to 'sequencer.c')
| -rw-r--r-- | sequencer.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sequencer.c b/sequencer.c index 0d8e11f..95ae4bc 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) { |