Merge branch 'ax/line-log-range-merge-fix'

diff --git a/fsck.h b/fsck.h
index dded84b5f9fceda7b2e9b3f13f4ccf464f6c7116..1891c1863be85c0607a86023e3da3d39d0dae22c 100644 (file)
--- a/fsck.h
+++ b/fsck.h
@@ -23,9 +23,11 @@ int is_valid_msg_type(const char *msg_id, const char *msg_type);
 typedef int (*fsck_walk_func)(struct object *obj, int type, void *data, struct fsck_options *options);
 
 /* callback for fsck_object, type is FSCK_ERROR or FSCK_WARN */
-typedef int (*fsck_error)(struct object *obj, int type, const char *message);
+typedef int (*fsck_error)(struct fsck_options *o,
+       struct object *obj, int type, const char *message);
 
-int fsck_error_function(struct object *obj, int type, const char *message);
+int fsck_error_function(struct fsck_options *o,
+       struct object *obj, int type, const char *message);
 
 struct fsck_options {
        fsck_walk_func walk;
@@ -33,6 +35,7 @@ struct fsck_options {
        unsigned strict:1;
        int *msg_type;
        struct sha1_array *skiplist;
+       struct decoration *object_names;
 };
 
 #define FSCK_OPTIONS_DEFAULT { NULL, fsck_error_function, 0, NULL }