diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-09-12 11:05:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-09-12 11:05:08 -0700 |
| commit | 40e94ca19adf00caa3d19a199b9b0a6079d12a3a (patch) | |
| tree | 3b4a451e3e4ba2c9345378ef7e3f55930b632ede /builtin/index-pack.c | |
| parent | 5ba9a93b39bef057be54ecf7933386a582981625 (diff) | |
| parent | f99b7af661f89865f918e52223a3bdaf312a0de0 (diff) | |
| download | git-40e94ca19adf00caa3d19a199b9b0a6079d12a3a.tar.gz git-40e94ca19adf00caa3d19a199b9b0a6079d12a3a.tar.xz | |
Merge branch 'js/fsck-tag-validation' into HEAD
* js/fsck-tag-validation:
Make sure that index-pack --strict checks tag objects
Add regression tests for stricter tag fsck'ing
fsck: check tag objects' headers
Make sure fsck_commit_buffer() does not run out of the buffer
fsck_object(): allow passing object data separately from the object itself
Refactor type_from_string() to allow continuing after detecting an error
Diffstat (limited to 'builtin/index-pack.c')
| -rw-r--r-- | builtin/index-pack.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/index-pack.c b/builtin/index-pack.c index 5568a5bc3..f2465ff18 100644 --- a/builtin/index-pack.c +++ b/builtin/index-pack.c @@ -773,7 +773,8 @@ static void sha1_object(const void *data, struct object_entry *obj_entry, if (!obj) die(_("invalid %s"), typename(type)); if (do_fsck_object && - fsck_object(obj, 1, fsck_error_function)) + fsck_object(obj, buf, size, 1, + fsck_error_function)) die(_("Error in object")); if (fsck_walk(obj, mark_link, NULL)) die(_("Not all child objects of %s are reachable"), sha1_to_hex(obj->sha1)); |