On Tue, Apr 19, 2016 at 04:02:22PM -0700, Junio C Hamano wrote: > "brian m. carlson" <[email protected]> writes: > > > @@ -314,7 +314,7 @@ static int threeway_callback(int n, unsigned long mask, > > unsigned long dirmask, s > > } > > > > if (same_entry(entry+0, entry+1)) { > > - if (entry[2].sha1 && !S_ISDIR(entry[2].mode)) { > > + if (entry[2].oid->hash && !S_ISDIR(entry[2].mode)) { > > Thanks for a warning in the cover letter. > > "if (entry[2].oid && !S_ISDIR(entry[2].mode)" would be a faithful > conversion, wouldn't it?
Yes, I think that would be a better conversion. I'll reroll after waiting for further comments. -- 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
signature.asc
Description: PGP signature
