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 <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
Mar 13, 2015 at 00:42 UTC
8ddf3ca74f40bebd79cedba5ba82ca9f2eb33860
1 file changed
-2
upload-pack.c
-2
@@ -688,8 +688,6 @@ static int mark_our_ref(const char *refname, const unsigned char *sha1)
688
o->flags |= HIDDEN_REF;
689
return 1;
690
}
691
- if (!o)
692
- die("git upload-pack: cannot find object %s:", sha1_to_hex(sha1));
691
o->flags |= OUR_REF;
692
return 0;
693
}