Re: [PATCH 1/2] diff: Fix modified lines stats with --stat and --numstat

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Sep 23, 2020, 20:44 UTC
Message-ID: <nycvar.QRO.7.76.6.2009232244000.5061@tvgsbejvaqbjf.bet>
In-Reply-To: <xmqqk0wki9fh.fsf@gitster.c.googlers.com>

Hi Junio,

On Wed, 23 Sep 2020, Junio C Hamano wrote:

Show 11 quoted lines

> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
>
> > I believe that that is exactly the reason why we want this:
> >
> > -	same_contents = oideq(&one->oid, &two->oid);
> > +	same_contents = one->oid_valid && two->oid_valid ?
> > 		oideq(&one->oid, &two->oid) : !strcmp(one->data, two->data);
>
> Not quite.  The other side should either be
>
> 	one->size == two->size && !memcmp(...)

Right!

Thank you for correcting my mistake, Dscho

>
> or just left to false, as the downstream code must be prepared for
> same_contents being false even when one and two turns out to be
> not-byte-for-byte-same but equivalent anyway.