summaryrefslogtreecommitdiff
path: root/blame.c
diff options
context:
space:
mode:
authorRené Scharfe <l.s.r@web.de>2020-10-11 16:03:37 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-10-12 19:25:14 (GMT)
commitdb7d07f61057e94e2a3683ca10d67a2a219f542f (patch)
treeff44066f9388f3ed228af7513e61cb9017b25dc5 /blame.c
parente30b1525fb017e86e08931a911f5451bf24176f5 (diff)
downloadgit-db7d07f61057e94e2a3683ca10d67a2a219f542f.zip
git-db7d07f61057e94e2a3683ca10d67a2a219f542f.tar.gz
git-db7d07f61057e94e2a3683ca10d67a2a219f542f.tar.bz2
blame: handle deref_tag() returning NULL
Signed-off-by: René Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'blame.c')
-rw-r--r--blame.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/blame.c b/blame.c
index 686845b..de7b5d4 100644
--- a/blame.c
+++ b/blame.c
@@ -2670,7 +2670,7 @@ static struct commit *find_single_final(struct rev_info *revs,
if (obj->flags & UNINTERESTING)
continue;
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);
if (found)
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? */
obj = revs->pending.objects[0].item;
obj = deref_tag(revs->repo, obj, NULL, 0);
- if (obj->type != OBJ_COMMIT)
+ if (!obj || obj->type != OBJ_COMMIT)
return NULL;
/* Do we have HEAD? */
@@ -2737,7 +2737,7 @@ static struct commit *find_single_initial(struct rev_info *revs,
if (!(obj->flags & UNINTERESTING))
continue;
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);
if (found)
die("More than one commit to dig up from, %s and %s?",