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

From: Jeff King <peff@peff.net>
Date: Jun 7, 2016, 06:23 UTC
Message-ID: <20160607062324.GA29484@sigill.intra.peff.net>
In-Reply-To: <575667E6.7030509@kdbg.org>

On Tue, Jun 07, 2016 at 08:21:26AM +0200, Johannes Sixt wrote:

Show 12 quoted lines

> > 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.

-Peff