summaryrefslogtreecommitdiff
path: root/fsck.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-09-26 14:39:43 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-09-26 14:39:43 -0700
commit13f4f046929de00a8c16171c5e08cdcae887b54d (patch)
tree44af90db2087ad26f7ecb7c2ad0007a503a3bc40 /fsck.h
parentMerge branch 'jk/faster-name-conflicts' (diff)
parentMake sure that index-pack --strict checks tag objects (diff)
downloadtgif-13f4f046929de00a8c16171c5e08cdcae887b54d.tar.xz
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 'fsck.h')
-rw-r--r--fsck.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/fsck.h b/fsck.h
index 1e4f527318..d1e6387a44 100644
--- a/fsck.h
+++ b/fsck.h
@@ -28,6 +28,8 @@ int fsck_error_function(struct object *obj, int type, const char *fmt, ...);
* 0 everything OK
*/
int fsck_walk(struct object *obj, fsck_walk_func walk, void *data);
-int fsck_object(struct object *obj, int strict, fsck_error error_func);
+/* If NULL is passed for data, we assume the object is local and read it. */
+int fsck_object(struct object *obj, void *data, unsigned long size,
+ int strict, fsck_error error_func);
#endif