diff options
| author |  Shawn O. Pearce <spearce@spearce.org> | 2008-02-24 03:07:28 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-02-24 10:01:24 -0800 |
| commit | 8a5a1884e93564cb1f46a73184d083a5181d573b (patch) | |
| tree | 7c702b2f8515acfc4e92e3753784ff0455036f19 /builtin-describe.c | |
| parent | Teach git-describe to use peeled ref information when scanning tags (diff) | |
| download | tgif-8a5a1884e93564cb1f46a73184d083a5181d573b.tar.xz | |
Avoid accessing non-tag refs in git-describe unless --all is requested
If we aren't going to use a ref there is no reason for us to open
its object from the object database. This avoids opening any of
the head commits reachable from refs/heads/ unless they are also
reachable through the commit we have been asked to describe and
we need to walk through it to find a tag.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-describe.c')
| -rw-r--r-- | builtin-describe.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/builtin-describe.c b/builtin-describe.c index bfd25e2324..9c958bd84b 100644 --- a/builtin-describe.c +++ b/builtin-describe.c @@ -46,11 +46,15 @@ static void add_to_known_names(const char *path, static int get_name(const char *path, const unsigned char *sha1, int flag, void *cb_data) { + int might_be_tag = !prefixcmp(path, "refs/tags/"); struct commit *commit; struct object *object; unsigned char peeled[20]; int is_tag, prio; + if (!all && !might_be_tag) + return 0; + if (!peel_ref(path, peeled) && !is_null_sha1(peeled)) { commit = lookup_commit_reference_gently(peeled, 1); if (!commit) @@ -68,7 +72,7 @@ static int get_name(const char *path, const unsigned char *sha1, int flag, void * If --tags, then any tags are used. * Otherwise only annotated tags are used. */ - if (!prefixcmp(path, "refs/tags/")) { + if (might_be_tag) { if (is_tag) { prio = 2; if (pattern && fnmatch(pattern, path + 10, 0)) |