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

Re: Ambiguous sha-1 during a rebase

From
Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date
Apr 14, 2016, 13:24 UTC
Message-ID
<vpqa8kwtjbc.fsf@anie.imag.fr>
In-Reply-To
<20160414093847.GA10852@glandium.org>
Mike Hommey <mh@glandium.org> writes:
> Yeah, that definitely is a weird corner case. Interestingly, it was
> complaining about "error: short SHA1 e34ff55 is ambiguous." when apply
> *other* commits that were in the list prior to it,

I think it did before: when normalizing the list to long sha1, i.e. right after you closed your editor and befor starting anything else.

> That said, that would be less likely to happen if disambiguation was
> also checking checking the object type. Collisions between commits are
> less likely than between objects of different types.
Right.
-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/
Previous: Mike HommeyNext: Remi Galan Alfonso
Message 6 of 8 in “Ambiguous sha-1 during a rebase”
  1. Mike HommeyApr 13, 2016
  2. Junio C HamanoApr 13, 2016
  3. Mike HommeyApr 13, 2016
  4. Matthieu MoyApr 14, 2016
  5. Mike HommeyApr 14, 2016
  6. Matthieu MoyApr 14, 2016
  7. Remi Galan AlfonsoApr 14, 2016
  8. Johannes SchindelinApr 14, 2016

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.