Re: [PATCH v3 23/24] merge-recursive: add sanity checks for relevant merge_options

From: Elijah Newren <newren@gmail.com>
Date: Aug 16, 2019, 22:09 UTC
Message-ID: <CABPp-BGb32Vc+TC5f-30Rh6-1QCan4DP84_XkX6YLD63So-s4Q@mail.gmail.com>
In-Reply-To: <xmqq8srs286r.fsf@gitster-ct.c.googlers.com>

On Fri, Aug 16, 2019 at 12:59 PM Junio C Hamano <gitster@pobox.com> wrote:

Show 12 quoted lines

>
> > diff --git a/merge-recursive.c b/merge-recursive.c
> > index 647b1f25c3..bc0da608c4 100644
> > --- a/merge-recursive.c
> > +++ b/merge-recursive.c
> > @@ -3620,6 +3620,29 @@ static int merge_start(struct merge_options *opt, struct tree *head)
> >  ...
> > +     assert(opt->buffer_output >= 0 && opt->buffer_output <= 2);
>
> The field is unsigned, so >=0 side triggers "-Werror=type-limits" warning.
>
> Material for squashing I have collected so far...

<snip>

Thanks, will include all of this in my next round.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.