Skip to content

Commit f838198

Browse files
committed
Merge branch 'jc/deref-tag' into maint
Code clean-up. * jc/deref-tag: blame, line-log: do not loop around deref_tag()
2 parents f792731 + 31da121 commit f838198

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

builtin/blame.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2425,8 +2425,7 @@ static struct commit *find_single_final(struct rev_info *revs,
24252425
struct object *obj = revs->pending.objects[i].item;
24262426
if (obj->flags & UNINTERESTING)
24272427
continue;
2428-
while (obj->type == OBJ_TAG)
2429-
obj = deref_tag(obj, NULL, 0);
2428+
obj = deref_tag(obj, NULL, 0);
24302429
if (obj->type != OBJ_COMMIT)
24312430
die("Non commit %s?", revs->pending.objects[i].name);
24322431
if (found)
@@ -2461,8 +2460,7 @@ static char *prepare_initial(struct scoreboard *sb)
24612460
struct object *obj = revs->pending.objects[i].item;
24622461
if (!(obj->flags & UNINTERESTING))
24632462
continue;
2464-
while (obj->type == OBJ_TAG)
2465-
obj = deref_tag(obj, NULL, 0);
2463+
obj = deref_tag(obj, NULL, 0);
24662464
if (obj->type != OBJ_COMMIT)
24672465
die("Non commit %s?", revs->pending.objects[i].name);
24682466
if (sb->final)

line-log.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -480,8 +480,7 @@ static struct commit *check_single_commit(struct rev_info *revs)
480480
struct object *obj = revs->pending.objects[i].item;
481481
if (obj->flags & UNINTERESTING)
482482
continue;
483-
while (obj->type == OBJ_TAG)
484-
obj = deref_tag(obj, NULL, 0);
483+
obj = deref_tag(obj, NULL, 0);
485484
if (obj->type != OBJ_COMMIT)
486485
die("Non commit %s?", revs->pending.objects[i].name);
487486
if (commit)

0 commit comments

Comments
 (0)