Re: [PATCH 2/9] ll-merge: make callers responsible for showing warnings

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Tue, Dec 21 2021, Elijah Newren wrote:

> On Tue, Dec 21, 2021 at 1:21 PM Ævar Arnfjörð Bjarmason
> <avarab@xxxxxxxxx> wrote:
>>
>> On Tue, Dec 21 2021, Elijah Newren via GitGitGadget wrote:
>>
>> > From: Elijah Newren <newren@xxxxxxxxx>
>>
>> > +     if (status == LL_MERGE_BINARY_CONFLICT)
>> > +             warning("Cannot merge binary files: %s (%s vs. %s)",
>> > +                     "base", "ours", "theirs");
>>
>> This & other messages in the series have warning/BUG etc. starting with
>> upper-case.
>
> Yes, but I'm not introducing a new message here; I'm merely moving an
> existing one.  It's important to me that readers of this patch be able
> to verify that I have made no functional changes in this patch, so
> fixing the case should definitely be a different patch from this one.
> I kind of think that fixing the case distracts a bit from the point of
> the series, and the series is already kind of long, but do you feel
> strongly that I should fix the case with a new patch inserted into the
> series?

I just missed the bit where it was moved from below in the diff. Sorry
about the noise.




[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux