Some legacy code has objects with non-fatal fsck issues; To enable the
user to ignore those issues, let's print out the ID (e.g. when
encountering "missing-email", the user might want to call `git config
--add receive.fsck.severity missing-email=warn`).
Signed-off-by: Johannes Schindelin <johannes.schindelin@xxxxxx>
---
fsck.c | 19 +++++++++++++++++++
t/t1450-fsck.sh | 4 ++--
2 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/fsck.c b/fsck.c
index b5e7d2c..e52b027 100644
--- a/fsck.c
+++ b/fsck.c
@@ -167,6 +167,23 @@ void fsck_set_severity(struct fsck_options *options, const char *mode)
}
}
+static void append_msg_id(struct strbuf *sb, const char *msg_id)
+{
+ for (;;) {
+ char c = *(msg_id)++;
+
+ if (!c)
+ break;
+ if (c == '_')
+ c = '-';
+ else
+ c = tolower(c);
+ strbuf_addch(sb, c);
+ }
+
+ 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, ...)
@@ -175,6 +192,8 @@ static int report(struct fsck_options *options, struct object *object,
struct strbuf sb = STRBUF_INIT;
int msg_severity = fsck_msg_severity(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_severity, sb.buf);
diff --git a/t/t1450-fsck.sh b/t/t1450-fsck.sh
index cfb32b6..ea0f216 100755
--- a/t/t1450-fsck.sh
+++ b/t/t1450-fsck.sh
@@ -231,8 +231,8 @@ test_expect_success 'tag with incorrect tag name & missing tagger' '
git fsck --tags 2>out &&
cat >expect <<-EOF &&
- warning in tag $tag: invalid '\''tag'\'' name: wrong name format
- warning in tag $tag: invalid format - expected '\''tagger'\'' line
+ warning in tag $tag: invalid-tag-name: invalid '\''tag'\'' name: wrong name format
+ warning in tag $tag: missing-tagger-entry: invalid format - expected '\''tagger'\'' line
EOF
test_cmp expect out
'
--
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