From: Jeff King <peff@peff.net>
To: "Kyle J. McKay" <mackyle@gmail.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
Junio C Hamano <gitster@pobox.com>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH 10/10] get_short_sha1: list ambiguous objects on error
Date: Thu, 29 Sep 2016 09:24:25 -0400 [thread overview]
Message-ID: <20160929132425.of7m5t4tsqcb6bbk@sigill.intra.peff.net> (raw)
In-Reply-To: <841D4FC2-9673-486A-8D94-8967188CCC60@gmail.com>
On Thu, Sep 29, 2016 at 06:01:51AM -0700, Kyle J. McKay wrote:
> But perhaps it makes sense to actually pick one if there's only one
> disambiguation of the type you're looking for.
>
> For example given:
>
> 235234a blob
> 2352347 tag
> 235234f tree
> 2352340 commit
>
> If you are doing "git cat-file blob 235234" it should pick the blob and spit
> out a warning (and similarly for other cat-file types). But "git cat-file
> -p 235234" would give the fatal error with the disambiguation hints because
> it wants type "any".
That code is already there; it's just a matter of whether git has enough
information to know the context. E.g. (in git.git):
$ git show b2e11
error: short SHA1 b2e11 is ambiguous
hint: The candidates are:
hint: b2e1196 tag v2.8.0-rc1
hint: b2e11d1 tree
...
$ git log b2e11
commit ab5d01a29eb7380ceab070f0807c2939849c44bc (tag: v2.8.0-rc1)
...
The "show" command can show anything, but "log" really wants
committishes, so it's able to disambiguate. It looks like cat-file never
learned to feed its context, but it's probably something like this:
diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index 94e67eb..ecbb959 100644
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -56,12 +56,22 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name,
struct object_info oi = {NULL};
struct strbuf sb = STRBUF_INIT;
unsigned flags = LOOKUP_REPLACE_OBJECT;
+ unsigned sha1_flags = 0;
const char *path = force_path;
if (unknown_type)
flags |= LOOKUP_UNKNOWN_OBJECT;
- if (get_sha1_with_context(obj_name, 0, oid.hash, &obj_context))
+ if (exp_type) {
+ if (!strcmp(exp_type, "commit"))
+ sha1_flags |= GET_SHA1_COMMITTISH;
+ else if(!strcmp(exp_type, "tree"))
+ sha1_flags |= GET_SHA1_TREEISH;
+ else if(!strcmp(exp_type, "blob"))
+ sha1_flags |= GET_SHA1_BLOB;
+ }
+
+ if (get_sha1_with_context(obj_name, sha1_flags, oid.hash, &obj_context))
die("Not a valid object name %s", obj_name);
if (!path)
> If you are doing "git show 235234" it should pick the tag (if it peels to a
> committish) because Git has already set a precedent of preferring tags over
> commits when it disambiguates ref names and otherwise pick the commit.
I'm not convinced that picking the tag is actually helpful in this case;
I agree with Linus that feeding something to "git show" almost always
wants to choose the commit.
I also don't think tag ambiguity in short sha1s is all that interesting.
There are a tiny number of tag objects. Most of your collisions are
going to be with trees or blobs, which should generally outnumber
commits by a factor of 5-10, though it depends on your workflow (git.git
does not have a deep tree, so it's only a factor of 4).
And if you just want to choose a committish over trees and blobs, well,
then; I invite you to check out the core.disambiguate patch I sent
elsewhere in the thread. :)
-Peff
next prev parent reply other threads:[~2016-09-29 13:24 UTC|newest]
Thread overview: 111+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-26 1:39 Changing the default for "core.abbrev"? Linus Torvalds
2016-09-26 3:46 ` Junio C Hamano
2016-09-26 4:34 ` Jeff King
2016-09-26 4:45 ` Junio C Hamano
2016-09-26 11:57 ` [PATCH 0/10] helping people resolve ambiguous sha1s Jeff King
2016-09-26 11:59 ` [PATCH 01/10] get_sha1: detect buggy calls with multiple disambiguators Jeff King
2016-09-26 16:37 ` Junio C Hamano
2016-09-26 17:21 ` Jeff King
2016-09-26 17:50 ` Junio C Hamano
2016-09-26 11:59 ` [PATCH 02/10] get_sha1: avoid repeating ourselves via ONLY_TO_DIE Jeff King
2016-09-26 11:59 ` [PATCH 03/10] get_sha1: propagate flags to child functions Jeff King
2016-09-26 11:59 ` [PATCH 04/10] get_short_sha1: peel tags when looking for treeish Jeff King
2016-09-26 12:11 ` Jeff King
2016-09-26 16:55 ` Junio C Hamano
2016-09-26 17:23 ` Jeff King
2016-09-26 12:00 ` [PATCH 05/10] get_short_sha1: refactor init of disambiguation code Jeff King
2016-09-26 12:00 ` [PATCH 06/10] get_short_sha1: NUL-terminate hex prefix Jeff King
2016-09-26 17:10 ` Junio C Hamano
2016-09-26 17:25 ` Jeff King
2016-09-26 17:36 ` Junio C Hamano
2016-09-26 12:00 ` [PATCH 07/10] get_short_sha1: mark ambiguity error for translation Jeff King
2016-09-26 12:00 ` [PATCH 08/10] sha1_array: let callbacks interrupt iteration Jeff King
2016-09-26 12:00 ` [PATCH 09/10] for_each_abbrev: drop duplicate objects Jeff King
2016-09-26 12:00 ` [PATCH 10/10] get_short_sha1: list ambiguous objects on error Jeff King
2016-09-26 16:36 ` Linus Torvalds
2016-09-27 5:42 ` Jacob Keller
2016-09-27 12:38 ` Jeff King
2016-09-29 13:01 ` Kyle J. McKay
2016-09-29 13:24 ` Jeff King [this message]
2016-09-29 14:36 ` Kyle J. McKay
2016-09-29 14:55 ` Jeff King
2016-09-26 17:30 ` Junio C Hamano
2016-09-26 17:34 ` Jeff King
2016-09-26 17:39 ` Junio C Hamano
2016-09-29 11:46 ` Kyle J. McKay
2016-09-29 13:03 ` Jeff King
2016-09-29 17:19 ` Junio C Hamano
2016-09-30 5:51 ` Jacob Keller
2019-02-04 16:12 ` [RFC/PATCH] core.abbrev doc: document and test the abbreviation length Ævar Arnfjörð Bjarmason
2019-02-04 19:13 ` Junio C Hamano
2019-02-04 20:04 ` Junio C Hamano
2019-02-04 21:36 ` Ævar Arnfjörð Bjarmason
2019-02-04 23:32 ` Jeff King
2019-02-04 23:50 ` Ævar Arnfjörð Bjarmason
2019-02-06 18:29 ` Jeff King
2019-02-06 18:36 ` Ævar Arnfjörð Bjarmason
2016-09-26 6:33 ` Changing the default for "core.abbrev"? Matthieu Moy
2016-09-26 12:09 ` Jeff King
2016-09-29 13:01 ` Kyle J. McKay
2016-09-26 7:13 ` Christian Couder
2016-09-28 23:30 ` [PATCH 0/4] raising core.abbrev default to 12 hexdigits Junio C Hamano
2016-09-28 23:30 ` [PATCH 1/4] config: allow customizing /etc/gitconfig location Junio C Hamano
2016-09-29 9:53 ` Jakub Narębski
2016-09-29 17:20 ` Junio C Hamano
2016-09-29 17:45 ` Matthieu Moy
2016-09-28 23:30 ` [PATCH 2/4] t13xx: do not assume system config is empty Junio C Hamano
2016-09-29 9:01 ` Jeff King
2016-09-29 18:13 ` Junio C Hamano
2016-09-29 18:26 ` Jeff King
2016-09-29 18:57 ` Junio C Hamano
2016-09-29 19:18 ` Jeff King
2016-09-29 19:57 ` Junio C Hamano
2016-09-29 19:06 ` Junio C Hamano
2016-09-29 19:26 ` Jeff King
2016-09-29 21:03 ` Junio C Hamano
2016-09-29 21:08 ` Jeff King
2016-09-28 23:30 ` [PATCH 3/4] worktree: honor configuration variables Junio C Hamano
2016-09-28 23:30 ` [PATCH 4/4] core.abbrev: raise the default abbreviation to 12 hexdigits Junio C Hamano
2016-09-29 2:44 ` SZEDER Gábor
2016-09-29 5:27 ` Lukas Fleischer
2016-09-29 9:22 ` Jeff King
2016-09-29 9:15 ` Jeff King
2016-09-29 10:03 ` Matthieu Moy
2016-09-29 12:52 ` SZEDER Gábor
2016-09-29 5:58 ` Johannes Sixt
2016-09-29 18:05 ` Junio C Hamano
2016-09-29 18:37 ` Linus Torvalds
2016-09-29 18:55 ` Linus Torvalds
2016-09-29 19:06 ` Linus Torvalds
2016-09-29 19:42 ` Junio C Hamano
2016-09-30 0:56 ` Mike Hommey
2016-09-30 1:01 ` Linus Torvalds
2016-09-30 19:41 ` Ævar Arnfjörð Bjarmason
2016-09-29 19:16 ` Jeff King
2016-09-29 19:40 ` Linus Torvalds
2016-09-29 19:45 ` Junio C Hamano
2016-09-29 21:53 ` Linus Torvalds
2016-09-29 23:13 ` Junio C Hamano
2016-09-29 23:20 ` Junio C Hamano
2016-09-30 0:20 ` Linus Torvalds
2016-09-30 0:28 ` Linus Torvalds
2016-09-30 0:57 ` Linus Torvalds
2016-09-30 1:18 ` Linus Torvalds
2016-09-30 3:54 ` Junio C Hamano
2016-09-30 4:10 ` Junio C Hamano
2016-09-30 4:18 ` Linus Torvalds
2016-09-30 4:29 ` Linus Torvalds
2016-09-30 4:27 ` Junio C Hamano
2016-09-30 4:35 ` Junio C Hamano
2016-09-30 18:40 ` Junio C Hamano
2016-09-30 18:51 ` Linus Torvalds
2016-09-30 19:00 ` Junio C Hamano
2016-09-30 4:11 ` Linus Torvalds
2016-09-30 8:06 ` Jeff King
2016-09-30 17:54 ` Linus Torvalds
2016-09-30 18:05 ` Jeff King
2016-09-30 18:21 ` Linus Torvalds
2016-09-30 20:01 ` Junio C Hamano
2016-09-30 17:56 ` Junio C Hamano
2016-09-30 7:47 ` Jeff King
2016-09-29 9:25 ` Jeff King
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160929132425.of7m5t4tsqcb6bbk@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=mackyle@gmail.com \
--cc=torvalds@linux-foundation.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).