git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: sporadic git failures on interactive rebase

From
Eric Sunshine <sunshine@sunshineco.com>
Date
Jan 14, 2015, 21:02 UTC
Message-ID
<CAPig+cSAbo0NJP4+NS7=vfhqL4KzWFiYX6mzESnp1HkSEeFVUw@mail.gmail.com>
In-Reply-To
<CAPig+cQ9GpL9r6Rr96jc6G=EvCArodSXC-qMzSBp=e7c7QQbtA@mail.gmail.com>
On Wed, Jan 14, 2015 at 4:00 PM, Eric Sunshine <sunshine@sunshineco.com> wrote:
Show 32 quoted lines
> On Wed, Jan 14, 2015 at 3:54 PM, Jeff King <peff@peff.net> wrote:
>> On Wed, Jan 14, 2015 at 09:12:46AM -0800, Junio C Hamano wrote:
>>
>>> 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?
>>
>> 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
Previous: Eric SunshineNext: Jeff King
Message 7 of 10 in “sporadic git failures on interactive rebase”
  1. Henning MollJan 13, 2015
  2. Jeff KingJan 14, 2015
  3. Jeff KingJan 14, 2015
  4. Junio C HamanoJan 14, 2015
  5. Jeff KingJan 14, 2015
  6. Eric SunshineJan 14, 2015
  7. Eric SunshineJan 14, 2015
  8. Jeff KingJan 14, 2015
  9. Eric SunshineJan 14, 2015
  10. Junio C HamanoJan 14, 2015

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.