There are legacy repositories out there whose older commits and tags
have issues that prevent pushing them when 'receive.fsckObjects' is set.
One real-life example is a commit object that has been hand-crafted to
list two authors.
Often, it is not possible to fix those issues without disrupting the
work with said repositories, yet it is still desirable to perform checks
by setting `receive.fsckObjects = true`. This commit is the first step
to allow demoting specific fsck issues to mere warnings.
The function added by this commit parses a list of settings in the form:
missing-email=warn,bad-name=warn,...
Unfortunately, the FSCK_WARN/FSCK_ERROR flag is only really heeded by
git fsck so far, but other call paths (e.g. git index-pack --strict)
error out *always* no matter what type was specified. Therefore, we
need to take extra care to default to all FSCK_ERROR in those cases.
Signed-off-by: Johannes Schindelin <johannes.schindelin@xxxxxx>
---
fsck.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
fsck.h | 7 +++++--
2 files changed, 72 insertions(+), 5 deletions(-)
diff --git a/fsck.c b/fsck.c
index 2d91e28..b5e7d2c 100644
--- a/fsck.c
+++ b/fsck.c
@@ -100,13 +100,73 @@ static int fsck_msg_severity(enum fsck_msg_id msg_id,
{
int severity;
- severity = msg_id_info[msg_id].severity;
- if (options->strict && severity == FSCK_WARN)
- severity = FSCK_ERROR;
+ assert(msg_id >= 0 && msg_id < FSCK_MSG_MAX);
+
+ if (options->msg_severity)
+ severity = options->msg_severity[msg_id];
+ else {
+ severity = msg_id_info[msg_id].severity;
+ if (options->strict && severity == FSCK_WARN)
+ severity = FSCK_ERROR;
+ }
return severity;
}
+static inline int substrcmp(const char *string, int len, const char *match)
+{
+ int match_len = strlen(match);
+ if (match_len != len)
+ return -1;
+ return memcmp(string, match, len);
+}
+
+void fsck_set_severity(struct fsck_options *options, const char *mode)
+{
+ int severity = FSCK_ERROR;
+
+ if (!options->msg_severity) {
+ int i;
+ int *msg_severity = xmalloc(sizeof(int) * FSCK_MSG_MAX);
+ for (i = 0; i < FSCK_MSG_MAX; i++)
+ msg_severity[i] = fsck_msg_severity(i, options);
+ options->msg_severity = msg_severity;
+ }
+
+ while (*mode) {
+ int len = strcspn(mode, " ,|"), equal, msg_id;
+
+ if (!len) {
+ mode++;
+ continue;
+ }
+
+ for (equal = 0; equal < len; equal++)
+ if (mode[equal] == '=' || mode[equal] == ':')
+ break;
+
+ msg_id = parse_msg_id(mode, equal);
+
+ if (equal == len)
+ severity = FSCK_ERROR;
+ else {
+ const char *p = mode + equal + 1;
+ int len2 = len - equal - 1;
+
+ if (!substrcmp(p, len2, "error"))
+ severity = FSCK_ERROR;
+ else if (!substrcmp(p, len2, "warn"))
+ severity = FSCK_WARN;
+ else
+ die("Unknown fsck message severity: '%.*s'",
+ len2, p);
+ }
+
+ options->msg_severity[msg_id] = severity;
+ mode += len;
+ }
+}
+
__attribute__((format (printf, 4, 5)))
static int report(struct fsck_options *options, struct object *object,
enum fsck_msg_id id, const char *fmt, ...)
@@ -596,6 +656,10 @@ int fsck_object(struct object *obj, void *data, unsigned long size,
int fsck_error_function(struct object *obj, int severity, const char *message)
{
+ if (severity == FSCK_WARN) {
+ warning("object %s: %s", sha1_to_hex(obj->sha1), message);
+ return 0;
+ }
error("object %s: %s", sha1_to_hex(obj->sha1), message);
return 1;
}
diff --git a/fsck.h b/fsck.h
index f6f268a..4349860 100644
--- a/fsck.h
+++ b/fsck.h
@@ -6,6 +6,8 @@
struct fsck_options;
+void fsck_set_severity(struct fsck_options *options, const char *mode);
+
/*
* callback function for fsck_walk
* type is the expected type of the object or OBJ_ANY
@@ -25,10 +27,11 @@ struct fsck_options {
fsck_walk_func walk;
fsck_error error_func;
unsigned strict:1;
+ int *msg_severity;
};
-#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:
--
2.2.0.33.gc18b867
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html