Browse Source

Merge branch 'jc/deref-tag' into maint

Code clean-up.

* jc/deref-tag:
  blame, line-log: do not loop around deref_tag()
maint
Junio C Hamano 9 years ago
parent
commit
f838198357
  1. 2
      builtin/blame.c
  2. 1
      line-log.c

2
builtin/blame.c

@ -2425,7 +2425,6 @@ static struct commit *find_single_final(struct rev_info *revs, @@ -2425,7 +2425,6 @@ 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);
if (obj->type != OBJ_COMMIT)
die("Non commit %s?", revs->pending.objects[i].name);
@ -2461,7 +2460,6 @@ static char *prepare_initial(struct scoreboard *sb) @@ -2461,7 +2460,6 @@ 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);
if (obj->type != OBJ_COMMIT)
die("Non commit %s?", revs->pending.objects[i].name);

1
line-log.c

@ -480,7 +480,6 @@ static struct commit *check_single_commit(struct rev_info *revs) @@ -480,7 +480,6 @@ 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);
if (obj->type != OBJ_COMMIT)
die("Non commit %s?", revs->pending.objects[i].name);

Loading…
Cancel
Save