diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-02-06 22:05:20 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-02-06 22:05:20 -0800 |
commit | 8fe9c3f21dff206acb464d86cbd3bf4dbbb94f38 (patch) | |
tree | f33b9ec70cc3d7e7a068d7ef24a6895d69accf00 /builtin/am.c | |
parent | Fifth batch for 2.21 (diff) | |
parent | rebase: implement --merge via the interactive machinery (diff) | |
download | tgif-8fe9c3f21dff206acb464d86cbd3bf4dbbb94f38.tar.xz |
Merge branch 'en/rebase-merge-on-sequencer'
"git rebase --merge" as been reimplemented by reusing the internal
machinery used for "git rebase -i".
* en/rebase-merge-on-sequencer:
rebase: implement --merge via the interactive machinery
rebase: define linearization ordering and enforce it
git-legacy-rebase: simplify unnecessary triply-nested if
git-rebase, sequencer: extend --quiet option for the interactive machinery
am, rebase--merge: do not overlook --skip'ed commits with post-rewrite
t5407: add a test demonstrating how interactive handles --skip differently
rebase: fix incompatible options error message
rebase: make builtin and legacy script error messages the same
Diffstat (limited to 'builtin/am.c')
-rw-r--r-- | builtin/am.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/builtin/am.c b/builtin/am.c index 95370313b6..6d1c6d3da9 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -2000,6 +2000,15 @@ static void am_skip(struct am_state *state) if (clean_index(&head, &head)) die(_("failed to clean index")); + if (state->rebasing) { + FILE *fp = xfopen(am_path(state, "rewritten"), "a"); + + assert(!is_null_oid(&state->orig_commit)); + fprintf(fp, "%s ", oid_to_hex(&state->orig_commit)); + fprintf(fp, "%s\n", oid_to_hex(&head)); + fclose(fp); + } + am_next(state); am_load(state); am_run(state, 0); |