зеркало из https://github.com/microsoft/git.git
Merge branch 'jc/deref-tag' into maint
Code clean-up. * jc/deref-tag: blame, line-log: do not loop around deref_tag()
This commit is contained in:
Коммит
f838198357
|
@ -2425,8 +2425,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)
|
||||
|
@ -2461,8 +2460,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)
|
||||
|
|
|
@ -480,8 +480,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)
|
||||
|
|
Загрузка…
Ссылка в новой задаче