Re: [PATCH/RFC 1/5] replay: support replaying 2-parent merges
- From
- Kristoffer Haugsbakk <kristofferhaugsbakk@fastmail.com>
- Date
- May 26, 2026, 21:15 UTC
- Message-ID
- <920cc022-8b63-4dbb-a41d-957ee01a5efd@app.fastmail.com>
- In-Reply-To
- <034ab0f83822e6db67baa423d9fcb753b12b5ac8.1778107405.git.gitgitgadget@gmail.com>
On Thu, May 7, 2026, at 00:43, Johannes Schindelin via GitGitGadget wrote:
Show 8 quoted lines
> From: Johannes Schindelin <johannes.schindelin@gmx.de> >[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).
Show 5 quoted lines
> + merge_finalize(&remerge_opt, &remerge_res); > + merge_finalize(&new_merge_opt, &new_merge_res); > + return picked; > } >[snip]