Merge branch 'jc/maint-unpack-objects-strict' into maint

* jc/maint-unpack-objects-strict:
  Fix "unpack-objects --strict"

Conflicts:
	builtin-unpack-objects.c

diff --cc builtin-unpack-objects.c
index 557148a693c058f51222cb3d996c309791d43d8b,bae00eabb0f8b712f2d737fe86cbd56421e0b441..3d650a1c41a4529863818fd613b95e83668bbfc1
--- 1/builtin-unpack-objects.c
--- 2/builtin-unpack-objects.c
+++ b/builtin-unpack-objects.c
@@@ -200,17 -200,19 +200,19 @@@ static int check_object(struct object *
  
        if (fsck_object(obj, 1, fsck_error_function))
                die("Error in object");
-       if (!fsck_walk(obj, check_object, NULL))
 -      if (fsck_walk(obj, check_object, 0))
++      if (fsck_walk(obj, check_object, NULL))
                die("Error on reachable objects of %s", sha1_to_hex(obj->sha1));
        write_cached_object(obj);
-       return 1;
+       return 0;
  }
  
  static void write_rest(void)
  {
        unsigned i;
-       for (i = 0; i < nr_objects; i++)
-               check_object(obj_list[i].obj, OBJ_ANY, NULL);
+       for (i = 0; i < nr_objects; i++) {
+               if (obj_list[i].obj)
 -                      check_object(obj_list[i].obj, OBJ_ANY, 0);
++                      check_object(obj_list[i].obj, OBJ_ANY, NULL);
+       }
  }
  
  static void added_object(unsigned nr, enum object_type type,