Merge branch 'dk/blame-move-no-reason-for-1-line-context' into maint

[thirdparty/git.git] / builtin / blame.c

diff --git a/builtin/blame.c b/builtin/blame.c
index a3f68747326836fff7b1f99ce3e5b858f77f97ab..9a035000b0c596523fd457073382101f99e89aa4 100644 (file)
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -2424,8 +2424,7 @@ static struct commit *find_single_final(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 (found)
@@ -2460,8 +2459,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)