Re: [PATCH v2] apply: resolve trivial merge without hitting ll-merge with "--3way"

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

 



Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx> writes:

> On Sun, Sep 05 2021, Junio C Hamano wrote:
>
>> +	if (!image->buf || type != OBJ_BLOB)
>> +		die("unable to read blob object %s", oid_to_hex(result_id));
>
> This die() message seems to only be applicable to the first condition
> here, shouldn't this be:

As this directly was lifted from read_mmblob(), it should be exactly
spelled as I wrote.




[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