From 31da121f2d316575ec3c82dfc0c7442cdb7a7740 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 14 Jun 2016 13:38:14 -0700 Subject: [PATCH] blame, line-log: do not loop around deref_tag() These callers appear to expect that deref_tag() is to peel one layer of a tag, but the function does not work that way; it has its own loop to unwrap tags until an object that is not a tag appears. Signed-off-by: Junio C Hamano --- builtin/blame.c | 6 ++---- line-log.c | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/builtin/blame.c b/builtin/blame.c index 048ed53c2f..0136dfcffa 100644 --- a/builtin/blame.c +++ b/builtin/blame.c @@ -2400,8 +2400,7 @@ static char *prepare_final(struct scoreboard *sb) struct object *obj = revs->pending.objects[i].item; if (obj->flags & UNINTERESTING) continue; - while (obj->type == OBJ_TAG) - obj = deref_tag(obj, NULL, 0); + obj = deref_tag(obj, NULL, 0); if (obj->type != OBJ_COMMIT) die("Non commit %s?", revs->pending.objects[i].name); if (sb->final) @@ -2428,8 +2427,7 @@ static char *prepare_initial(struct scoreboard *sb) struct object *obj = revs->pending.objects[i].item; if (!(obj->flags & UNINTERESTING)) continue; - while (obj->type == OBJ_TAG) - obj = deref_tag(obj, NULL, 0); + obj = deref_tag(obj, NULL, 0); if (obj->type != OBJ_COMMIT) die("Non commit %s?", revs->pending.objects[i].name); if (sb->final) diff --git a/line-log.c b/line-log.c index 626b22cc31..2aa33be693 100644 --- a/line-log.c +++ b/line-log.c @@ -479,8 +479,7 @@ static struct commit *check_single_commit(struct rev_info *revs) struct object *obj = revs->pending.objects[i].item; if (obj->flags & UNINTERESTING) continue; - while (obj->type == OBJ_TAG) - obj = deref_tag(obj, NULL, 0); + obj = deref_tag(obj, NULL, 0); if (obj->type != OBJ_COMMIT) die("Non commit %s?", revs->pending.objects[i].name); if (commit) -- 2.11.4.GIT