On Wed, Jan 14, 2015 at 4:00 PM, Eric Sunshine <sunshine@xxxxxxxxxxxxxx> wrote: > On Wed, Jan 14, 2015 at 3:54 PM, Jeff King <peff@xxxxxxxx> wrote: >> On Wed, Jan 14, 2015 at 09:12:46AM -0800, Junio C Hamano wrote: >> >>> Jeff King <peff@xxxxxxxx> 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? >> >> Yeah, you're right. I didn't even remember that commit at all. On the >> off chance that the abbreviation code was different in that earlier >> version, I also checked rebasing 01319837 with an older version, but it >> does work fine. >> >> So yeah, the most plausible theory to me so far is unluckiness combined >> with pre-1.8.4.2. That should be easy to disprove if Henning tells us >> his git version. > > Henning mentioned it at the very top of his original problem report: > > "(git version 2.2.0)" For completeness: http://article.gmane.org/gmane.comp.version-control.git/262334 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html