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

From: "Kristoffer Haugsbakk" <[email-masked]>
Date: Tue, 26 May 2026 23:15:52 +0200

On Thu, May 7, 2026, at 00:43, Johannes Schindelin via GitGitGadget wrote:
> From: Johannes Schindelin <[email-masked]>
>[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]