From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 14 Jan 2015 17:12:46 GMT
Subject: Re: sporadic git failures on interactive rebase
Message-ID: <xmqqvbk9b81d.fsf@gitster.dls.corp.google.com>
In-Reply-To: <20150114123536.GA31530@peff.net>

Jeff King <peff@peff.net> writes:

> What happens if we rebase with it?
>
>   $ git checkout 01319837
>   $ git rebase -i HEAD^
>
> will yield a todo file with the 8-character unambiguous abbreviation.
>
> So I guess all is working as intended there. Perhaps you really were
> just very unlucky and an earlier step of the rebase created a
> conflicting sha1.

That would mean 75c69766 (rebase -i: fix short SHA-1 collision,
2013-08-23) did not fix what it intended to fix, no?  Is the symptom
coming from pre-1.8.4.2 version of Git?