summaryrefslogtreecommitdiff
path: root/upload-pack.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-08-24 19:18:02 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-08-24 19:18:02 (GMT)
commitb7fcd007153b5021ed70ddc0a224127f14601bbc (patch)
tree5596bb4cd891229cc1a35399dbd0cc4b509d6833 /upload-pack.c
parent8d9185bc12650a9839dff45a8754f05618cdb3f5 (diff)
parentccef6048cd697063967e5e02937911fd8125b364 (diff)
downloadgit-b7fcd007153b5021ed70ddc0a224127f14601bbc.zip
git-b7fcd007153b5021ed70ddc0a224127f14601bbc.tar.gz
git-b7fcd007153b5021ed70ddc0a224127f14601bbc.tar.bz2
Sync with 1.7.6.1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'upload-pack.c')
-rw-r--r--upload-pack.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/upload-pack.c b/upload-pack.c
index 6420918..8739bfa 100644
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -533,6 +533,8 @@ static void check_non_tip(void)
namebuf[41] = '\n';
for (i = get_max_object_index(); 0 < i; ) {
o = get_indexed_object(--i);
+ if (!o)
+ continue;
if (!(o->flags & OUR_REF))
continue;
memcpy(namebuf + 1, sha1_to_hex(o->sha1), 40);