Re: USE_SHA1DC is broken in pu

From: Junio C Hamano <gitster@pobox.com>
Date: Mar 16, 2017, 19:46 UTC
Message-ID: <xmqqbmt1atta.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <CA+55aFzp_dxevLEbRVWCmbx=zY=8hwqEBKK=Pcs7Au+rdg4pRQ@mail.gmail.com>

Linus Torvalds <torvalds@linux-foundation.org> writes:

Show 14 quoted lines

> On Thu, Mar 16, 2017 at 12:41 PM, Jeff King <peff@peff.net> wrote:
>>
>> Potentially we should just eject sha1dc from "pu" for the moment. It
>> needs re-rolled with the most recent version of the collision library
>> (and I see Marc just posted that they hit a stable point, which is
>> perhaps why you're looking at it).
>
> I looked at it, and even created a patch, and then decided that you'd
> probably do it.
>
> But yes, re-integrating entirely (rather than creating a patch against
> the previous SHA1DC) might be simpler.
>
> Junio, which way do you want to go?

That's easy to answer. What we have on 'pu' is a fair game for wholesale replacement. That is the whole point of not merging topics in flux to 'next' and declaring that 'pu' will constantly rewind.