From: Junio C Hamano <gitster@pobox•com>
To: Jeff King <peff@peff•net>
Cc: Henning Moll <newsScott@gmx•de>, git@vger•kernel.org
Subject: Re: sporadic git failures on interactive rebase
Date: Wed, 14 Jan 2015 09:12:46 -0800 [thread overview]
Message-ID: <xmqqvbk9b81d.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <20150114123536.GA31530@peff.net> (Jeff King's message of "Wed, 14 Jan 2015 07:35:36 -0500")
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?
next prev parent reply other threads:[~2015-01-14 17:12 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-13 10:54 sporadic git failures on interactive rebase Henning Moll
2015-01-14 12:19 ` Jeff King
2015-01-14 12:35 ` Jeff King
2015-01-14 17:12 ` Junio C Hamano [this message]
2015-01-14 20:54 ` Jeff King
2015-01-14 21:00 ` Eric Sunshine
2015-01-14 21:02 ` Eric Sunshine
2015-01-14 21:02 ` Jeff King
2015-01-14 21:11 ` Eric Sunshine
2015-01-14 21:57 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqvbk9b81d.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=newsScott@gmx$(echo .)de \
--cc=peff@peff$(echo .)net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox