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. -Peff -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
