From 71ab8fa840fcca4b4f80acba6a529e3cbc174b65 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Mon, 22 Jun 2015 17:25:52 +0200 Subject: fsck: report the ID of the error/warning Some repositories written by legacy code have objects with non-fatal fsck issues. To allow the user to ignore those issues, let's print out the ID (e.g. when encountering "missingEmail", the user might want to call `git config --add receive.fsck.missingEmail=warn`). Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano --- fsck.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'fsck.c') diff --git a/fsck.c b/fsck.c index e6e8dc4c9..4748f1e23 100644 --- a/fsck.c +++ b/fsck.c @@ -189,6 +189,24 @@ void fsck_set_msg_types(struct fsck_options *options, const char *values) free(to_free); } +static void append_msg_id(struct strbuf *sb, const char *msg_id) +{ + for (;;) { + char c = *(msg_id)++; + + if (!c) + break; + if (c != '_') + strbuf_addch(sb, tolower(c)); + else { + assert(*msg_id); + strbuf_addch(sb, *(msg_id)++); + } + } + + strbuf_addstr(sb, ": "); +} + __attribute__((format (printf, 4, 5))) static int report(struct fsck_options *options, struct object *object, enum fsck_msg_id id, const char *fmt, ...) @@ -197,6 +215,8 @@ static int report(struct fsck_options *options, struct object *object, struct strbuf sb = STRBUF_INIT; int msg_type = fsck_msg_type(id, options), result; + append_msg_id(&sb, msg_id_info[id].id_string); + va_start(ap, fmt); strbuf_vaddf(&sb, fmt, ap); result = options->error_func(object, msg_type, sb.buf); -- cgit v1.2.1