diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-09-27 01:39:43 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-09-27 01:39:43 +0400 |
| commit | 13f4f046929de00a8c16171c5e08cdcae887b54d (patch) | |
| tree | 44af90db2087ad26f7ecb7c2ad0007a503a3bc40 /builtin/index-pack.c | |
| parent | 9bc4222746a09d57998903dab0361b1d7adc271f (diff) | |
| parent | f99b7af661f89865f918e52223a3bdaf312a0de0 (diff) | |
Merge branch 'js/fsck-tag-validation'
Teach "git fsck" to inspect the contents of annotated tag objects.
* 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 eebf1a8fc2..f89df017c2 100644 --- a/builtin/index-pack.c +++ b/builtin/index-pack.c @@ -779,7 +779,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)); |