From: Matthieu Moy <Matthieu.Moy@grenoble-inp•fr>
To: Mike Hommey <mh@glandium•org>
Cc: Junio C Hamano <gitster@pobox•com>, git@vger•kernel.org
Subject: Re: Ambiguous sha-1 during a rebase
Date: Thu, 14 Apr 2016 15:24:07 +0200 [thread overview]
Message-ID: <vpqa8kwtjbc.fsf@anie.imag.fr> (raw)
In-Reply-To: <20160414093847.GA10852@glandium.org> (Mike Hommey's message of "Thu, 14 Apr 2016 18:38:47 +0900")
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/
next prev parent reply other threads:[~2016-04-14 13:24 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-13 22:29 Ambiguous sha-1 during a rebase Mike Hommey
2016-04-13 22:42 ` Junio C Hamano
2016-04-13 22:52 ` Mike Hommey
2016-04-14 9:09 ` Matthieu Moy
2016-04-14 9:38 ` Mike Hommey
2016-04-14 13:24 ` Matthieu Moy [this message]
2016-04-14 17:27 ` Remi Galan Alfonso
2016-04-14 15:55 ` Johannes Schindelin
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=vpqa8kwtjbc.fsf@anie.imag.fr \
--to=matthieu.moy@grenoble-inp$(echo .)fr \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=mh@glandium$(echo .)org \
/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