diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-08-03 11:01:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-08-03 11:01:18 -0700 |
| commit | b2f44feba593ed0c4294a6f9933c8a1b6f190e04 (patch) | |
| tree | 3b3d19bc7fd5883a4cdf6e0bbf8cf161a63eeab9 /fsck.h | |
| parent | be9cb560e31c76c00760dadb151b5e3059970586 (diff) | |
| parent | 1335f732892601368876e0e41c9ea288c2ab18f3 (diff) | |
| download | git-b2f44feba593ed0c4294a6f9933c8a1b6f190e04.tar.gz | |
Merge branch 'js/fsck-opt'
Allow ignoring fsck errors on specific set of known-to-be-bad
objects, and also tweaking warning level of various kinds of non
critical breakages reported.
* js/fsck-opt:
fsck: support ignoring objects in `git fsck` via fsck.skiplist
fsck: git receive-pack: support excluding objects from fsck'ing
fsck: introduce `git fsck --connectivity-only`
fsck: support demoting errors to warnings
fsck: document the new receive.fsck.<msg-id> options
fsck: allow upgrading fsck warnings to errors
fsck: optionally ignore specific fsck issues completely
fsck: disallow demoting grave fsck errors to warnings
fsck: add a simple test for receive.fsck.<msg-id>
fsck: make fsck_tag() warn-friendly
fsck: handle multiple authors in commits specially
fsck: make fsck_commit() warn-friendly
fsck: make fsck_ident() warn-friendly
fsck: report the ID of the error/warning
fsck (receive-pack): allow demoting errors to warnings
fsck: offer a function to demote fsck errors to warnings
fsck: provide a function to parse fsck message IDs
fsck: introduce identifiers for fsck messages
fsck: introduce fsck options
Diffstat (limited to 'fsck.h')
| -rw-r--r-- | fsck.h | 30 |
1 files changed, 24 insertions, 6 deletions
@@ -3,6 +3,14 @@ #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 @@ -12,13 +20,23 @@ * <0 error signaled and abort * >0 error signaled and do not abort */ -typedef int (*fsck_walk_func)(struct object *obj, int type, void *data); +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 *err, ...); +typedef int (*fsck_error)(struct object *obj, int type, const char *message); + +int fsck_error_function(struct object *obj, int type, const char *message); + +struct fsck_options { + fsck_walk_func walk; + fsck_error error_func; + unsigned strict:1; + int *msg_type; + struct sha1_array *skiplist; +}; -__attribute__((format (printf, 3, 4))) -int fsck_error_function(struct object *obj, int type, const char *fmt, ...); +#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: @@ -27,9 +45,9 @@ int fsck_error_function(struct object *obj, int type, const char *fmt, ...); * >0 return value of the first signaled error >0 (in the case of no other errors) * 0 everything OK */ -int fsck_walk(struct object *obj, fsck_walk_func walk, void *data); +int fsck_walk(struct object *obj, void *data, struct fsck_options *options); /* 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); + struct fsck_options *options); #endif |