From mboxrd@z Thu Jan 1 00:00:00 1970 From: Johannes Schindelin Subject: [PATCH v2 13/18] fsck: Optionally ignore specific fsck issues completely Date: Mon, 19 Jan 2015 16:51:29 +0100 Organization: gmx Message-ID: <342278d6d900bced3fbb46fc1ecee995afff1ede.1421682369.git.johannes.schindelin@gmx.de> References: Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Cc: git@vger.kernel.org To: gitster@pobox.com X-From: git-owner@vger.kernel.org Mon Jan 19 16:59:45 2015 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1YDEjv-0006J3-EB for gcvg-git-2@plane.gmane.org; Mon, 19 Jan 2015 16:59:43 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751711AbbASP7g (ORCPT ); Mon, 19 Jan 2015 10:59:36 -0500 Received: from s15462909.onlinehome-server.info ([87.106.4.80]:35068 "EHLO s15462909.onlinehome-server.info" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751580AbbASP7c (ORCPT ); Mon, 19 Jan 2015 10:59:32 -0500 X-Greylist: delayed 563 seconds by postgrey-1.27 at vger.kernel.org; Mon, 19 Jan 2015 10:59:22 EST Received: from s15462909.onlinehome-server.info (localhost.localdomain [127.0.0.1]) by s15462909.onlinehome-server.info (8.14.4/8.14.4/Debian-4.1ubuntu1) with ESMTP id t0JFpTI9026419; Mon, 19 Jan 2015 16:51:29 +0100 Received: (from www-data@localhost) by s15462909.onlinehome-server.info (8.14.4/8.14.4/Submit) id t0JFpTgQ026418; Mon, 19 Jan 2015 16:51:29 +0100 X-Authentication-Warning: s15462909.onlinehome-server.info: www-data set sender to johannes.schindelin@gmx.de using -f X-PHP-Originating-Script: 1000:rcube.php In-Reply-To: X-Sender: johannes.schindelin@gmx.de User-Agent: Roundcube Webmail/1.1-git Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: 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 warn=missing-email 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 --- 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 f2c8044..649c8fe 100644 --- a/fsck.c +++ b/fsck.c @@ -152,6 +152,8 @@ void fsck_set_severity(struct fsck_options *options, const char *mode) severity = FSCK_ERROR; else if (!substrcmp(mode, equal, "warn")) severity = FSCK_WARN; + else if (!substrcmp(mode, equal, "ignore")) + severity = FSCK_IGNORE; else die("Unknown fsck message severity: '%.*s'", equal, mode); @@ -193,6 +195,9 @@ static int report(struct fsck_options *options, struct object *object, struct strbuf sb = STRBUF_INIT; int msg_severity = fsck_msg_severity(id, options), result; + if (msg_severity == FSCK_IGNORE) + return 0; + if (msg_severity == FSCK_FATAL) msg_severity = FSCK_ERROR; diff --git a/fsck.h b/fsck.h index 4349860..7be6c50 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 2757c3a..e81cedb 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.warn = missing-email' ' test_must_fail git push --porcelain dst bogus && git --git-dir=dst/.git config receive.fsck.warn missing-email && 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.ignore missing-email && + git --git-dir=dst/.git config receive.fsck.warn bad-date && + git push --porcelain dst bogus >act 2>&1 && + test_must_fail grep "missing-email" act ' test_expect_success 'receive.fsck.warn = unterminated-header triggers error' ' -- 2.0.0.rc3.9669.g840d1f9