Skip to content

Commit

Permalink
Avoid accessing non-tag refs in git-describe unless --all is requested
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
spearce authored and gitster committed Feb 24, 2008
1 parent feededd commit 8a5a188
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion builtin-describe.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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))
Expand Down

0 comments on commit 8a5a188

Please sign in to comment.