Always perfer annotated tags in git-describe.
PATCH 1/4 Always perfer annotated tags in git-describe.
Several people have suggested that its always better to describe a commit using an annotated tag, and to only use a lightweight tag if absolutely no annotated tag matches the input commit.
Signed-off-by Shawn O. Pearce <[email protected]>
--- builtin-describe.c | 24 +++++++++++++----------- 1 files changed, 13 insertions(+), 11 deletions(-)
builtin-describe.c +13 -11
@@ -138,6 +138,7 @@ static void describe(const char *arg, int last_one)commit_list_insert (cmit, &list);while (list) {struct commit *c =pop_commit (&list); +struct commit_list *parents = c->parents; n =match (c);if (n) {struct possible_tag *p =xmalloc (sizeof (*p));
@@ -148,17 +149,17 @@ static void describe(const char *arg, int last_one)else all_matches = p; cur_match = p; - }else { -struct commit_list *parents = c->parents; -while (parents) { -struct commit *p = parents->item; -parse_commit (p); -if (!(p->object.flags &SEEN )) { - p->object.flags |=SEEN ; -insert_by_date (p, &list); - } - parents = parents->next; +if (n->prio ==2 ) +continue ; + } +while (parents) { +struct commit *p = parents->item; +parse_commit (p); +if (!(p->object.flags &SEEN )) { + p->object.flags |=SEEN ; +insert_by_date (p, &list); } + parents = parents->next; } }
@@ -181,7 +182,8 @@ static void describe(const char *arg, int last_one)while ((!min_match || cur_match->depth < min_match->depth) &&get_revision (&revs)) cur_match->depth++; -if (!min_match || cur_match->depth < min_match->depth) +if (!min_match || (cur_match->depth < min_match->depth + && cur_match->name->prio >= min_match->name->prio)) min_match = cur_match;free_commit_list (revs.commits); }
Signature · 1 line
1.5.0.rc1.g4494
builtin-describe.c static void describe(const char *arg, int last_one) · line 153
Quoted 6 lines · Shawn O. Pearce
builtin-describe.c +2
-0@@ -148,17 +149,17 @@ static void describe(const char *arg, int last_one)else all_matches = p; cur_match = p; +if (n->prio ==2 ) +continue ;
When you do not have _any_ annotated tag but you do have lightweight tags, wouldn't this make the traversal go all the way down to root?
Quoted 12 lines · Junio C Hamano
builtin-describe.c static void describe(const char *arg, int last_one) · line 153
Quoted 6 lines · Shawn O. Pearce
builtin-describe.c +2
-0@@ -148,17 +149,17 @@ static void describe(const char *arg, int last_one)else all_matches = p; cur_match = p; +if (n->prio ==2 ) +continue ;When you do not have _any_ annotated tag but you do have lightweight tags, wouldn't this make the traversal go all the way down to root?
This is irrelevant now. Please ignore.