Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jc/maint-smart-http-race-upload-pack' into maint
author
Junio C Hamano
<gitster@pobox.com>
Wed, 24 Aug 2011 19:16:15 +0000
(12:16 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 24 Aug 2011 19:16:15 +0000
(12:16 -0700)
* jc/maint-smart-http-race-upload-pack:
get_indexed_object can return NULL if nothing is in that slot; check for it
upload-pack.c
patch
|
blob
|
history
raw
(from parent 1:
b0b35a6
)
diff --git
a/upload-pack.c
b/upload-pack.c
index a9a6c0cb24ba1d91212650a33d9249a5202454aa..03adf28550a30ecd441b9586fc9dfa638c939ce3 100644
(file)
--- 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);