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

Re: Ambiguous sha-1 during a rebase

From
Remi Galan Alfonso <remi.galan-alfonso@ensimag.grenoble-inp.fr>
Date
Apr 14, 2016, 17:27 UTC
Message-ID
<749683959.3734012.1460654824023.JavaMail.zimbra@ensimag.grenoble-inp.fr>
In-Reply-To
<vpqa8kwtjbc.fsf@anie.imag.fr>
Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> writes:
Show 8 quoted lines
> 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.

In that case, I'm surprised that the rebase didn't stop before doing any action.

I am guessing that the "error: short SHA1 e34ff55 is ambiguous." is comming from either 'check_commit_sha' called by 'check_todo_list' or by 'transform_todo_ids' called by 'expand_todo_ids'.

If my guess is correct {
 - If the former, it means that 'check_commit_sha' is not doing its
   job properly (it did not return an error code, which would have
   triggered a 'die' later and stopped the rebase at the beginning).
 - If the latter, it means that 'check_commit_sha' and
   'check_todo_list' missed an occasion to error out.
}
On a side note, is there a way to test for ambiguous SHA1?

Thanks, Rémi

Previous: Matthieu MoyNext: Johannes Schindelin
Message 7 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.