tag.c: implement '--merged' and '--no-merged' options

diff --git a/fsck.h b/fsck.h
index f6f268aa72540a7cdc4e8efdb10b0fb61d6e2ca7..dded84b5f9fceda7b2e9b3f13f4ccf464f6c7116 100644 (file)
--- a/fsck.h
+++ b/fsck.h
@@ -3,9 +3,15 @@
 
 #define FSCK_ERROR 1
 #define FSCK_WARN 2
+#define FSCK_IGNORE 3
 
 struct fsck_options;
 
+void fsck_set_msg_type(struct fsck_options *options,
+               const char *msg_id, const char *msg_type);
+void fsck_set_msg_types(struct fsck_options *options, const char *values);
+int is_valid_msg_type(const char *msg_id, const char *msg_type);
+
 /*
  * callback function for fsck_walk
  * type is the expected type of the object or OBJ_ANY
@@ -25,10 +31,12 @@ struct fsck_options {
        fsck_walk_func walk;
        fsck_error error_func;
        unsigned strict:1;
+       int *msg_type;
+       struct sha1_array *skiplist;
 };
 
-#define FSCK_OPTIONS_DEFAULT { NULL, fsck_error_function, 0 }
-#define FSCK_OPTIONS_STRICT { NULL, fsck_error_function, 1 }
+#define FSCK_OPTIONS_DEFAULT { NULL, fsck_error_function, 0, NULL }
+#define FSCK_OPTIONS_STRICT { NULL, fsck_error_function, 1, NULL }
 
 /* descend in all linked child objects
  * the return value is: