From: Usman Akinyemi <usmanakinyemi202@gmail.com>
Date: Wed, 16 Oct 2024 18:00:00 GMT
Subject: Re: [PATCH 3/3] parse: replace atoi() with strtoul_ui() and strtol_i()
Message-ID: <CAPSxiM9KnkNjhtcQvZn0sekZimyzqtzX4Q3xpH_GGhy8goCWdw@mail.gmail.com>
In-Reply-To: <87090897-7ff9-4396-b81c-0fc423593602@gmail.com>

On Wed, Oct 16, 2024 at 9:20 AM Phillip Wood <phillip.wood123@gmail.com> wrote:
>
> On 15/10/2024 19:28, phillip.wood123@gmail.com wrote:
> > On 15/10/2024 16:17, Usman Akinyemi wrote:
> >>
> >> I grepped the error message and I noticed that the message is gotten
> >> from parse-options.c and it ensures that the arg is negative. How to
> >> proceed in such a case ?
> >
> > The code you're changing parses the conflict-marker-size attribute so
> > you need to set up a .gitattributes file with an invalid marker size and
> > then run "git merge" or "git cherry-pick"
Thanks.
>
> t/t6406-merge-attr.sh would be a good place to add this test
Thank you Philip.
>
> Best Wishes
>
> Phillip
>