summaryrefslogtreecommitdiff
path: root/builtin/fsck.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-09-26 14:39:43 -0700
committerJunio C Hamano <gitster@pobox.com>2014-09-26 14:39:43 -0700
commit13f4f046929de00a8c16171c5e08cdcae887b54d (patch)
tree44af90db2087ad26f7ecb7c2ad0007a503a3bc40 /builtin/fsck.c
parent9bc4222746a09d57998903dab0361b1d7adc271f (diff)
parentf99b7af661f89865f918e52223a3bdaf312a0de0 (diff)
downloadgit-13f4f046929de00a8c16171c5e08cdcae887b54d.tar.gz
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/fsck.c')
-rw-r--r--builtin/fsck.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/fsck.c b/builtin/fsck.c
index 0928a98a71..e9ba576c1f 100644
--- a/builtin/fsck.c
+++ b/builtin/fsck.c
@@ -298,7 +298,7 @@ static int fsck_obj(struct object *obj)
if (fsck_walk(obj, mark_used, NULL))
objerror(obj, "broken links");
- if (fsck_object(obj, check_strict, fsck_error_func))
+ if (fsck_object(obj, NULL, 0, check_strict, fsck_error_func))
return -1;
if (obj->type == OBJ_TREE) {