diff options
| author | Taylor Blau <me@ttaylorr.com> | 2022-10-31 02:04:42 +0100 |
|---|---|---|
| committer | Taylor Blau <me@ttaylorr.com> | 2022-10-31 02:04:43 +0100 |
| commit | 8851c4b0652f7e69abfe0016503ab9ea1d247c84 (patch) | |
| tree | 3f4ed481646060a330429949df440b4524fda537 /sequencer.c | |
| parent | Merge branch 'pw/rebase-keep-base-fixes' (diff) | |
| parent | rebase: cleanup action handling (diff) | |
| download | git-8851c4b0652f7e69abfe0016503ab9ea1d247c84.tar.xz git-8851c4b0652f7e69abfe0016503ab9ea1d247c84.zip | |
Merge branch 'pw/rebase-reflog-fixes'
Fix some bugs in the reflog messages when rebasing and changes the
reflog messages of "rebase --apply" to match "rebase --merge" with
the aim of making the reflog easier to parse.
* pw/rebase-reflog-fixes:
rebase: cleanup action handling
rebase --abort: improve reflog message
rebase --apply: make reflog messages match rebase --merge
rebase --apply: respect GIT_REFLOG_ACTION
rebase --merge: fix reflog message after skipping
rebase --merge: fix reflog when continuing
t3406: rework rebase reflog tests
rebase --apply: remove duplicated code
Diffstat (limited to 'sequencer.c')
| -rw-r--r-- | sequencer.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sequencer.c b/sequencer.c index debb2ecbaf..e658df7e8f 100644 --- a/sequencer.c +++ b/sequencer.c @@ -5050,6 +5050,8 @@ int sequencer_continue(struct repository *r, struct replay_opts *opts) if (read_populate_opts(opts)) return -1; if (is_rebase_i(opts)) { + char *previous_reflog_action; + if ((res = read_populate_todo(r, &todo_list, opts))) goto release_todo_list; @@ -5060,10 +5062,13 @@ int sequencer_continue(struct repository *r, struct replay_opts *opts) unlink(rebase_path_dropped()); } + previous_reflog_action = xstrdup(getenv(GIT_REFLOG_ACTION)); + setenv(GIT_REFLOG_ACTION, reflog_message(opts, "continue", NULL), 1); if (commit_staged_changes(r, opts, &todo_list)) { res = -1; goto release_todo_list; } + setenv(GIT_REFLOG_ACTION, previous_reflog_action, 1); } else if (!file_exists(get_todo_path(opts))) return continue_single_pick(r, opts); else if ((res = read_populate_todo(r, &todo_list, opts))) |