Re: [PATCH 4/8] Rename struct diff_filespec's sha1_valid member.

From: Junio C Hamano <gitster@pobox.com>
Date: Jun 7, 2016, 19:14 UTC
Message-ID: <xmqqmvmwq09p.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <20160607062324.GA29484@sigill.intra.peff.net>

Jeff King <peff@peff.net> writes:

Show 16 quoted lines

> On Tue, Jun 07, 2016 at 08:21:26AM +0200, Johannes Sixt wrote:
>
>> > diff --git a/combine-diff.c b/combine-diff.c
>> > index f39be434..a20caa80 100644
>> > --- a/combine-diff.c
>> > +++ b/combine-diff.c
>> > @@ -1269,7 +1269,7 @@ static struct diff_filepair *combined_pair(struct combine_diff_path *p,
>> >   		pair->one[i].path = p->path;
>> >   		pair->one[i].mode = p->parent[i].mode;
>> >   		oidcpy(&pair->one->oid, &p->parent[i].oid);
>> > -		pair->one[i].sha1_valid = !is_null_oid(&p->parent[i].oid);
>> > +		pair->one->oid_valid = !is_null_oid(&p->parent[i].oid);
>> 
>> Is this transformation correct?
>
> Or the oidcpy() above it, which was introduced in patch 3.

Indeed these look wrong.