On Tue, Jun 07, 2016 at 12:14:42PM -0700, Junio C Hamano wrote:
> Jeff King <peff@peff.net> writes:
> 
> > 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.

Yes, those do look wrong.  I'll figure out where I went wrong when I
reroll.
-- 
brian m. carlson / brian with sandals: Houston, Texas, US
+1 832 623 2791 | https://www.crustytoothpaste.net/~bmc | My opinion only
OpenPGP: https://keybase.io/bk2204