[PATCH 2/7] upload-pack: do not check NULL return of lookup_unknown_object
- From
Jeff King <peff@peff.net>
- Date
- Mar 13, 2015, 04:42 UTC
- Message-ID
- <20150313044224.GB18532@peff.net>
- In-Reply-To
- <20150313044101.GA18476@peff.net>
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> --- upload-pack.c | 2 -- 1 file changed, 2 deletions(-)
diff --git a/upload-pack.c b/upload-pack.c index c8e8713..aa84576 100644 --- a/upload-pack.c +++ b/upload-pack.c @@ -689,8 +689,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.3.2.472.geadab3c