diff options
| author | Phillip Wood <phillip.wood@dunelm.org.uk> | 2022-10-12 12:35:07 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-10-17 22:55:03 +0300 |
| commit | da1d63363f13d4d65c59564c74fd8dd598b39c49 (patch) | |
| tree | 29741a3e45957c2f3c7a31e7b6baf720f640ce09 /builtin/rebase.c | |
| parent | 4e5e1b4b616f0354218ff2e2ff3c71e4c730bbe1 (diff) | |
rebase --merge: fix reflog when continuing
The reflog message for a conflict resolution committed by "rebase
--continue" looks like
rebase (continue): commit subject line
Unfortunately the reflog message each subsequent pick look like
rebase (continue) (pick): commit subject line
Fix this by setting the reflog message for "rebase --continue" in
sequencer_continue() so it does not affect subsequent commits. This
introduces a memory leak similar to the one leaking GIT_REFLOG_ACTION
in pick_commits(). Both of these will be fixed in a future series that
stops the sequencer calling setenv().
If we fail to commit the staged changes then we error out so
GIT_REFLOG_ACTION does not need to be reset in that case.
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/rebase.c')
| -rw-r--r-- | builtin/rebase.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c index e67020b358..414526f83a 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -1271,8 +1271,6 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) int fd; options.action = "continue"; - set_reflog_action(&options); - /* Sanity check */ if (get_oid("HEAD", &head)) die(_("Cannot read HEAD")); |