From: Phillip Wood <phillip.wood123@gmail.com>
Date: Wed, 16 Oct 2024 09:20:11 GMT
Subject: Re: [PATCH 3/3] parse: replace atoi() with strtoul_ui() and strtol_i()
Message-ID: <87090897-7ff9-4396-b81c-0fc423593602@gmail.com>
In-Reply-To: <9952b3a7-0ebc-4555-b8b3-f50f6f383704@gmail.com>

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"

t/t6406-merge-attr.sh would be a good place to add this test

Best Wishes

Phillip