Merge branch 'lt/rev-list' into next

diff --git a/fsck-objects.c b/fsck-objects.c
index 9950be264501a5c99eafe7c2438b27b857ba6402..4ddd67699cfefccee34caa38f2334789ef43dbfc 100644 (file)
--- a/fsck-objects.c
+++ b/fsck-objects.c
@@ -20,7 +20,7 @@ static int check_strict = 0;
 static int keep_cache_objects = 0; 
 static unsigned char head_sha1[20];
 
-#if NO_D_INO_IN_DIRENT
+#ifdef NO_D_INO_IN_DIRENT
 #define SORT_DIRENT 0
 #define DIRENT_SORT_HINT(de) 0
 #else
@@ -61,9 +61,12 @@ static void check_connectivity(void)
        int i;
 
        /* Look up all the requirements, warn about missing objects.. */
-       for (i = 0; i < nr_objs; i++) {
+       for (i = 0; i < obj_allocs; i++) {
                struct object *obj = objs[i];
 
+               if (!obj)
+                       continue;
+
                if (!obj->parsed) {
                        if (!standalone && has_sha1_file(obj->sha1))
                                ; /* it is in pack */