Re: [PATCH/RFC 1/5] replay: support replaying 2-parent merges
From: Kristoffer Haugsbakk <hidden>
Date: 2026-05-26 21:16:18
On Thu, May 7, 2026, at 00:43, Johannes Schindelin via GitGitGadget wrote:
quoted hunk ↗ jump to hunk
From: Johannes Schindelin <redacted> [snip]diff --git a/replay.c b/replay.c[snip] +out: + free(ancestor_name); + free_commit_list(parent_bases); + free_commit_list(replayed_bases);
`free_commit_list` is deprecated in favor of `commit_list_free` since 52882024 (Merge branch 'ps/commit-list-functions-renamed', 2026-02-13).
+ merge_finalize(&remerge_opt, &remerge_res); + merge_finalize(&new_merge_opt, &new_merge_res); + return picked; } [snip]