undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

blame: handle deref_tag() returning NULL

Browse Source 
Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
René Scharfe 2020-10-11 18:03:37 +02:00 committed by Junio C Hamano
parent e30b1525fb
commit db7d07f610
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
blame.c
View File

@ -2670,7 +2670,7 @@ static struct commit *find_single_final(struct rev_info *revs,
if (obj->flags & UNINTERESTING) if (obj->flags & UNINTERESTING)
continue; continue;
obj = deref_tag(revs->repo, obj, NULL, 0); obj = deref_tag(revs->repo, obj, NULL, 0);
if (obj->type != OBJ_COMMIT) if (!obj || obj->type != OBJ_COMMIT)
die("Non commit %s?", revs->pending.objects[i].name); die("Non commit %s?", revs->pending.objects[i].name);
if (found) if (found)
die("More than one commit to dig from %s and %s?", die("More than one commit to dig from %s and %s?",
@ -2701,7 +2701,7 @@ static struct commit *dwim_reverse_initial(struct rev_info *revs,
/* Is that sole rev a committish? */ /* Is that sole rev a committish? */
obj = revs->pending.objects[0].item; obj = revs->pending.objects[0].item;
obj = deref_tag(revs->repo, obj, NULL, 0); obj = deref_tag(revs->repo, obj, NULL, 0);
if (obj->type != OBJ_COMMIT) if (!obj || obj->type != OBJ_COMMIT)
return NULL; return NULL;
/* Do we have HEAD? */ /* Do we have HEAD? */
@ -2737,7 +2737,7 @@ static struct commit *find_single_initial(struct rev_info *revs,
if (!(obj->flags & UNINTERESTING)) if (!(obj->flags & UNINTERESTING))
continue; continue;
obj = deref_tag(revs->repo, obj, NULL, 0); obj = deref_tag(revs->repo, obj, NULL, 0);
if (obj->type != OBJ_COMMIT) if (!obj || obj->type != OBJ_COMMIT)
die("Non commit %s?", revs->pending.objects[i].name); die("Non commit %s?", revs->pending.objects[i].name);
if (found) if (found)
die("More than one commit to dig up from, %s and %s?", die("More than one commit to dig up from, %s and %s?",

2
builtin/blame.c
View File

@ -820,6 +820,8 @@ static int peel_to_commit_oid(struct object_id *oid_ret, void *cbdata)
if (kind != OBJ_TAG) if (kind != OBJ_TAG)
return -1; return -1;
obj = deref_tag(r, parse_object(r, &oid), NULL, 0); obj = deref_tag(r, parse_object(r, &oid), NULL, 0);
if (!obj)
return -1;
oidcpy(&oid, &obj->oid); oidcpy(&oid, &obj->oid);
} }
} }