summaryrefslogtreecommitdiff
path: root/builtin-unpack-objects.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-08-27 23:59:08 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-08-27 23:59:08 (GMT)
commitab36d06f12b7243de419bb82b11a678bea30eef2 (patch)
tree7f74ade9f26a4a809835002d84c389156826b0cf /builtin-unpack-objects.c
parentc3f0cadfa8a99099a3a7852d717867924ba45106 (diff)
parent9a217391e931763d168d177decfe5e962d306bac (diff)
downloadgit-ab36d06f12b7243de419bb82b11a678bea30eef2.zip
git-ab36d06f12b7243de419bb82b11a678bea30eef2.tar.gz
git-ab36d06f12b7243de419bb82b11a678bea30eef2.tar.bz2
Merge branch 'jc/maint-unpack-objects-strict'
* jc/maint-unpack-objects-strict: Fix "unpack-objects --strict" Conflicts: builtin-unpack-objects.c
Diffstat (limited to 'builtin-unpack-objects.c')
-rw-r--r--builtin-unpack-objects.c16
1 files changed, 9 insertions, 7 deletions
diff --git a/builtin-unpack-objects.c b/builtin-unpack-objects.c
index 968fda7..685566e 100644
--- a/builtin-unpack-objects.c
+++ b/builtin-unpack-objects.c
@@ -181,10 +181,10 @@ static void write_cached_object(struct object *obj)
static int check_object(struct object *obj, int type, void *data)
{
if (!obj)
- return 0;
+ return 1;
if (obj->flags & FLAG_WRITTEN)
- return 1;
+ return 0;
if (type != OBJ_ANY && obj->type != type)
die("object type mismatch");
@@ -195,22 +195,24 @@ static int check_object(struct object *obj, int type, void *data)
if (type != obj->type || type <= 0)
die("object of unexpected type");
obj->flags |= FLAG_WRITTEN;
- return 1;
+ return 0;
}
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, 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, NULL);
+ }
}
static void added_object(unsigned nr, enum object_type type,