git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH/RFC 1/5] replay: support replaying 2-parent merges

From
Philippe Blain <levraiphilippeblain@gmail.com>
Date
Nov 5, 2026, 12:38 UTC
Message-ID
<0107772D-4F64-4F24-9E68-C6709AF264EA@gmail.com>
In-Reply-To
<034ab0f83822e6db67baa423d9fcb753b12b5ac8.1778107405.git.gitgitgadget@gmail.com>
Hi Dscho,
> Le 4 nov. 2026 à 21:19, Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com> a écrit :
> From: Johannes Schindelin <johannes.schindelin@gmx.de>
—8<—
Show 15 quoted lines
> ---
> builtin/history.c         |  16 ++-
> replay.c                  | 209 ++++++++++++++++++++++++++++++++++++--
> t/t3451-history-reword.sh |  21 ++--
> t/t3452-history-split.sh  |   6 +-
> t/t3650-replay-basics.sh  |  46 ++++++++-
> 5 files changed, 269 insertions(+), 29 deletions(-)
> 
> diff --git a/replay.c b/replay.c
> index f96f1f6551..3dbce095f9 100644
> --- a/replay.c
> +++ b/replay.c
> @@ -1,6 +1,7 @@
> #define USE_THE_REPOSITORY_VARIABLE
> 
—8<—
Show 14 quoted lines
> +/*
> + * Replay a 2-parent merge commit by composing three calls into merge-ort:
> + *
> + *   R = recursive merge of pickme's two original parents (auto-remerge of
> + *       the original merge, accepting any conflicts)
> + *   N = recursive merge of the (possibly rewritten) parents
> + *   O = pickme's tree (the user's actual merge, including any manual
> + *       resolutions)
> + *
> + * The picked tree comes from a non-recursive merge using R as the base,
> + * O as side1 and N as side2. `git diff R O` is morally `git show
> + * --remerge-diff $oldmerge`, so this layers the user's original manual
> + * resolution on top of the freshly auto-merged rewritten parents (see
> + * `replay-design-notes.txt` on the `replay` branch of newren/git).
Maybe we would want to add these design notes as a technical document when this series is out of RFC ? This way we refer to our own documentation. 
—8<—
Show 39 quoted lines
> @@ -407,17 +550,63 @@ int replay_revisions(struct rev_info *revs,
>    merge_opt.show_rename_progress = 0;
>    last_commit = onto;
>    replayed_commits = kh_init_oid_map();
> +
> +    /*
> +     * Seed the rewritten-commit map with each negative-side ("BOTTOM")
> +     * cmdline entry pointing at `onto`. This matters for merge replay:
> +     * a 2-parent merge whose first parent is the boundary (e.g. the
> +     * commit being reworded) must replay onto the rewritten boundary,
> +     * yet pick_merge_commit uses a self fallback so the second parent
> +     * (a side branch outside the rewrite range) is preserved as-is.
> +     * Pre-seeding the boundary disambiguates the two: in the map ->
> +     * rewritten, missing -> kept as-is.
> +     *
> +     * Only do this for the pick path; revert mode chains reverts
> +     * through last_commit and a pre-seeded boundary would short-circuit
> +     * that chain.
> +     */
> +    if (mode == REPLAY_MODE_PICK) {
> +        for (size_t i = 0; i < revs->cmdline.nr; i++) {
> +            struct rev_cmdline_entry *e = &revs->cmdline.rev[i];
> +            struct commit *boundary;
> +            khint_t pos;
> +            int hr;
> +
> +            if (!(e->flags & BOTTOM))
> +                continue;
> +            boundary = lookup_commit_reference_gently(revs->repo,
> +                                  &e->item->oid, 1);
> +            if (!boundary)
> +                continue;
> +            pos = kh_put_oid_map(replayed_commits,
> +                         boundary->object.oid, &hr);
> +            if (hr != 0)
> +                kh_value(replayed_commits, pos) = onto;
> +        }
> +    }
> +
I understand the intent here, we seed the replayed commit map with onto for the negative revisions, so that a merge with its first parent at the boundary gets its first parent rewritten to onto, but keeps its second parent.  But I think a further tweak is necessary. 
I tried the following: 
- amend the first parent of a merge M (manually, in detached HEAD), changing only the commit message 
- try to replay the merge. Since none of the trees have changed, and the merge-base hasn’t changed, I expect replay to succeed and keep manually resolutions from M. I ran this:
git replay --onto HEAD M^!
and because with this syntax M^2 is a negative revision, it gets mapped to onto, whereas from what I understand it should _not_ be mapped and should be left untouched by replay: the new merge should have M^2 as second parent. 
Since the second parent gets mapped to onto, the merge-base of the replayed merge is changed, so the fast past is skipped,  the new merge conflicts and the replay fails. 
Also, I think this pre-seeding should be mentionned in the commit message. 
Thank you for working on this,and Elijah for prototyping it.  It’s already is a massive time saver for me. 
Philippe. 
Previous: Kristoffer HaugsbakkNext: Philippe Blain
Message 8 of 19 in “replay: support replaying 2-parent merges”
  1. 0/5 replay: support replaying 2-parent mergesJohannes Schindelin via GitGitGadget, May 6, 2026
  2. 1/5 replay: support replaying 2-parent mergesJohannes Schindelin via GitGitGadget, May 6, 2026
  3. Phillip WoodMay 8, 2026
  4. Phillip WoodMay 8, 2026
  5. Johannes SchindelinMay 17, 2026
  6. Johannes SchindelinMay 17, 2026
  7. Kristoffer HaugsbakkMay 26, 2026
  8. Philippe BlainNov 5, 2026
  9. Philippe BlainNov 13, 2026
  10. 2/5 replay: short-circuit merge replay when parent and base trees are unchangedJohannes Schindelin via GitGitGadget, May 6, 2026
  11. 3/5 history.adoc: describe merge-replay support and its limitsJohannes Schindelin via GitGitGadget, May 6, 2026
  12. 5/5 t3454: cover merge-replay scenarios with the historian helperJohannes Schindelin via GitGitGadget, May 6, 2026
  13. 4/5 test-tool: add a "historian" subcommand for building merge fixturesJohannes Schindelin via GitGitGadget, May 6, 2026
  14. Toon ClaesMay 12, 2026
  15. Johannes SchindelinMay 17, 2026
  16. D. Ben KnobleMay 7, 2026
  17. Johannes SchindelinMay 7, 2026
  18. Ben KnobleMay 7, 2026
  19. Johannes SchindelinMay 17, 2026

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.