An fsck issue in a legacy repository might be so common that one would
like not to bother the user with mentioning it at all. With this change,
that is possible by setting the respective error to "ignore".
This change "abuses" the missing-email=warn test to verify that "ignore"
is also accepted and works correctly. And while at it, it makes sure
that multiple options work, too (they are passed to unpack-objects or
index-pack as a comma-separated list via the --strict=... command-line
option).
Signed-off-by: Johannes Schindelin <johannes.schinde...@gmx.de>
---
fsck.c | 5 +++++
fsck.h | 1 +
t/t5504-fetch-receive-strict.sh | 7 ++++++-
3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/fsck.c b/fsck.c
index f8339af..abfd3af 100644
--- a/fsck.c
+++ b/fsck.c
@@ -146,6 +146,8 @@ void fsck_strict_mode(struct fsck_options *options, const
char *mode)
type = FSCK_ERROR;
else if (!substrcmp(type_str, type_len, "warn"))
type = FSCK_WARN;
+ else if (!substrcmp(type_str, type_len, "ignore"))
+ type = FSCK_IGNORE;
else
die("Unknown fsck message type: '%.*s'",
len - equal - 1, type_str);
@@ -184,6 +186,9 @@ static int report(struct fsck_options *options, struct
object *object,
struct strbuf sb = STRBUF_INIT;
int msg_type = fsck_msg_type(id, options), result;
+ if (msg_type == FSCK_IGNORE)
+ return 0;
+
append_msg_id(&sb, msg_id_str[id]);
va_start(ap, fmt);
diff --git a/fsck.h b/fsck.h
index 9d67ea2..82bedf9 100644
--- a/fsck.h
+++ b/fsck.h
@@ -3,6 +3,7 @@
#define FSCK_ERROR 1
#define FSCK_WARN 2
+#define FSCK_IGNORE 3
struct fsck_options;
diff --git a/t/t5504-fetch-receive-strict.sh b/t/t5504-fetch-receive-strict.sh
index 8a47db2..0e521d9 100755
--- a/t/t5504-fetch-receive-strict.sh
+++ b/t/t5504-fetch-receive-strict.sh
@@ -132,7 +132,12 @@ test_expect_success 'push with receive.fsck.missing-mail =
warn' '
test_must_fail git push --porcelain dst bogus &&
git --git-dir=dst/.git config receive.fsck.missing-email warn &&
git push --porcelain dst bogus >act 2>&1 &&
- grep "missing-email" act
+ grep "missing-email" act &&
+ git --git-dir=dst/.git branch -D bogus &&
+ git --git-dir=dst/.git config receive.fsck.missing-email ignore &&
+ git --git-dir=dst/.git config receive.fsck.bad-date warn &&
+ git push --porcelain dst bogus >act 2>&1 &&
+ test_must_fail grep "missing-email" act
'
test_expect_success 'receive.fsck.unterminated-header = warn triggers error' '
--
2.0.0.rc3.9669.g840d1f9
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
