Re: [PATCH v2 0/5] merge-tree --stdin: flush stdout

[Phillip Wood <phillip.wood123@xxxxxxxxx>]

On 18/02/2025 16:46, Elijah Newren wrote:
> On Tue, Feb 18, 2025 at 8:24 AM Phillip Wood via GitGitGadget
> > Range-diff vs v1:
> >
> >   1:  3b317978509 = 1:  3b317978509 merge-tree --stdin: flush stdout to avoid deadlock
> >   2:  16fec87766f ! 2:  63b09dbe1b7 merge-tree: remove redundant code
> >       @@ Commit message
> >
> >            real_merge() only ever returns "0" or "1" as it dies if the merge status
> >            is less than zero. Therefore the check for "result < 0" is redundant and
> >       -    the result variable is not needed.
> >       +    the result variable is not needed. The return value of real_merge() is
> >       +    ignored because exit status of "git merge-tree --stdin" is "0" for both
> >       +    successful and conflicted merges (the status of each merge is written to
> >       +    stdout). The return type of real_merge() is not changed as it is used
> >       +    for the program's exit status when "--stdin" is not given.
> >
> >            Signed-off-by: Phillip Wood <phillip.wood@xxxxxxxxxxxxx>
> >
> >   3:  bf1dc603a15 = 3:  f95a15a4203 merge-tree: only use basic merge config
> >   4:  4c416850634 = 4:  1645b0e747e merge-tree: improve docs for --stdin
> >   5:  89722894c87 = 5:  a0179820092 merge-tree: fix link formatting in html docs
>
> This round looks good to me; thanks.

That's great, thanks very much for reviewing these patches

Best Wishes

Phillip