Re: [PATCH 1/6] reflog-walk: skip over double-null oid due to HEAD rename

From: Jeff King <peff@peff.net>
Date: Jul 5, 2017, 21:21 UTC
Message-ID: <20170705212105.3qjdzgtut23v6igw@sigill.intra.peff.net>
In-Reply-To: <xmqqo9syiy9g.fsf@gitster.mtv.corp.google.com>

On Wed, Jul 05, 2017 at 10:34:03AM -0700, Junio C Hamano wrote:

Show 10 quoted lines

> > +		if (!logobj)
> > +			logobj = parse_object(&reflog->ooid);
> >  	}
> 
> For the current 'maint', this would need to be backported to the
> uchar[20] interface (which is trivial to do, and merging it upwards
> while adjusting it back to "struct object_id" is also trivial; there
> is no need to resend).
> 
> Thanks.  Will queue.

Ah, right. I should probably actually apply the patches on "maint" before suggesting you do so. ;)

In theory it should be applied directly on 39ee4c6c2 and then merged up (but I think the same wiggling would apply either way).

The rest of the patches would need to be adjusted on top, but it should be easy to resolve; all of that code just goes away.

-Peff