From: Mike Hommey <mh@glandium.org>
To: git@vger.kernel.org
Subject: Ambiguous sha-1 during a rebase
Date: Thu, 14 Apr 2016 07:29:19 +0900 [thread overview]
Message-ID: <20160413222919.GA10474@glandium.org> (raw)
Hi,
Something interesting happened to me. I was in the middle of an
interactive rebase, and after a --continue, I got:
error: short SHA1 e34ff55 is ambiguous.
fatal: Needed a single revision
Invalid commit name: e34ff55
One thing that happened, is that, while running that interactive rebase,
I /also/ did a `git remote update` from an other shell, which, I guess,
happened to have imported another object that made e34ff55 ambiguous.
Should git-rebase use full sha-1s under the hood to avoid these type of
races?
Relatedly, having looked up the ambiguity, it turns out the other object
that fits the same short sha1 is a tree... maybe git should be able to
disambiguate in that case, since it was looking for a commit, and
there's only one commit with that short sha1?
Mike
next reply other threads:[~2016-04-13 22:29 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-13 22:29 Mike Hommey [this message]
2016-04-13 22:42 ` Ambiguous sha-1 during a rebase 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
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=20160413222919.GA10474@glandium.org \
--to=mh@glandium.org \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).