summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2015-03-13 00:42:25 -0400
committerJunio C Hamano <gitster@pobox.com>2015-03-12 23:21:16 -0700
commit8ddf3ca74f40bebd79cedba5ba82ca9f2eb33860 (patch)
tree892d6a13773d6edd93a7c65691cd17c9f791947f
parente172755b1eeb061c8fafb5ae8e4e9e72f68a0cdd (diff)
downloadgit-8ddf3ca74f40bebd79cedba5ba82ca9f2eb33860.tar.gz
upload-pack: do not check NULL return of lookup_unknown_objectjk/smart-http-hide-refs
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>
-rw-r--r--upload-pack.c2
1 files changed, 0 insertions, 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;
}