From: Elijah Newren <newren@gmail.com>
Date: Tue, 18 Feb 2025 15:56:07 GMT
Subject: Re: [PATCH 4/5] merge-tree: improve docs for --stdin
Message-ID: <CABPp-BHqg45=yo4EPmYc9bFpB-wt8vaR1BCqksX1wgEQyq999w@mail.gmail.com>
In-Reply-To: <1b6ba7c4-56e2-4892-93d3-d57c7193432d@gmail.com>

On Tue, Feb 18, 2025 at 2:02 AM Phillip Wood <phillip.wood123@gmail.com> wrote:
>
> Hi Elijah
>
> On 17/02/2025 20:26, Elijah Newren wrote:
> > On Sun, Feb 16, 2025 at 8:37 AM Phillip Wood via GitGitGadget
> > <gitgitgadget@gmail.com> wrote:
> >>
> >> Also correct the
> >> merge status documentation for --stdin as if the status is less than
> >> zero "git merge-tree" dies before printing it.
> >
> > This also makes sense, but...die'ing still has an exit status
> > associated with it right?
>
> It does, but that is documented in a separate section which says that if
> there is an error it exits with a code that isn't 0 or 1. The section
> I've altered is documenting what "git merge-tree --stdin" prints to
> stdout and if result.clean is less than zero then it dies it does not
> print anything to stdout.
>
> Best Wishes
>
> Phillip

Oh, right, so your patch is good then.  Thanks for pointing out what I missed.