undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

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

Conflicts:
	builtin-unpack-objects.c
This commit is contained in:
Junio C Hamano 2009-09-16 14:45:18 -07:00
commit af4f640529
2 changed files with 44 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
builtin-unpack-objects.c
View File

@ -181,10 +181,10 @@ static void write_cached_object(struct object *obj)
static int check_object(struct object *obj, int type, void *data) static int check_object(struct object *obj, int type, void *data)
{ {
if (!obj) if (!obj)
return 0; return 1;
if (obj->flags & FLAG_WRITTEN) if (obj->flags & FLAG_WRITTEN)
return 1; return 0;
if (type != OBJ_ANY && obj->type != type) if (type != OBJ_ANY && obj->type != type)
die("object type mismatch"); 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) if (type != obj->type || type <= 0)
die("object of unexpected type"); die("object of unexpected type");
obj->flags |= FLAG_WRITTEN; obj->flags |= FLAG_WRITTEN;
return 1; return 0;
} }
if (fsck_object(obj, 1, fsck_error_function)) if (fsck_object(obj, 1, fsck_error_function))
die("Error in object"); 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)); die("Error on reachable objects of %s", sha1_to_hex(obj->sha1));
write_cached_object(obj); write_cached_object(obj);
return 1; return 0;
} }
static void write_rest(void) static void write_rest(void)
{ {
unsigned i; unsigned i;
for (i = 0; i < nr_objects; i++) for (i = 0; i < nr_objects; i++) {
if (obj_list[i].obj)
check_object(obj_list[i].obj, OBJ_ANY, NULL); check_object(obj_list[i].obj, OBJ_ANY, NULL);
}
} }
static void added_object(unsigned nr, enum object_type type, static void added_object(unsigned nr, enum object_type type,

35
t/t5531-deep-submodule-push.sh Normal file
View File

@ -0,0 +1,35 @@
#!/bin/sh
test_description='unpack-objects'
. ./test-lib.sh
test_expect_success setup '
mkdir pub.git &&
GIT_DIR=pub.git git init --bare
GIT_DIR=pub.git git config receive.fsckobjects true &&
mkdir work &&
(
cd work &&
git init &&
mkdir -p gar/bage &&
(
cd gar/bage &&
git init &&
>junk &&
git add junk &&
git commit -m "Initial junk"
) &&
git add gar/bage &&
git commit -m "Initial superproject"
)
'
test_expect_success push '
(
cd work &&
git push ../pub.git master
)
'
test_done