From 8ddf3ca74f40bebd79cedba5ba82ca9f2eb33860 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Fri, 13 Mar 2015 00:42:25 -0400 Subject: [PATCH] upload-pack: do not check NULL return of lookup_unknown_object We check whether the return value of lookup_unknown_object is NULL, but some code paths dereference it before our check. This turns out not to be capable of causing a segfault, though. The lookup_unknown_object function will never return NULL, since the whole point is to allocate an object struct if it does not find an existing one. So the code here is not wrong, it is just confusing. Let's just drop the NULL check. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- upload-pack.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/upload-pack.c b/upload-pack.c index af2a13acc6..4bc2dc3607 100644 --- a/upload-pack.c +++ b/upload-pack.c @@ -688,8 +688,6 @@ static int mark_our_ref(const char *refname, const unsigned char *sha1) o->flags |= HIDDEN_REF; return 1; } - if (!o) - die("git upload-pack: cannot find object %s:", sha1_to_hex(sha1)); o->flags |= OUR_REF; return 0; } -- 2.11.4.GIT