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

Re: sporadic git failures on interactive rebase

From
Junio C Hamano <gitster@pobox.com>
Date
Jan 14, 2015, 17:12 UTC
Message-ID
<xmqqvbk9b81d.fsf@gitster.dls.corp.google.com>
In-Reply-To
<20150114123536.GA31530@peff.net>
Jeff King <peff@peff.net> writes:
Show 10 quoted lines
> 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?

Previous: Jeff KingNext: Jeff King
Message 4 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.