[PATCH v4 16/19] fsck: Support demoting errors to warnings
From: Johannes Schindelin <hidden>
Date: 2016-06-15 23:03:43
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
We already have support in `git receive-pack` to deal with some legacy repositories which have non-fatal issues. Let's make `git fsck` itself useful with such repositories, too, by allowing users to ignore known issues, or at least demote those issues to mere warnings. Example: `git -c fsck.severity=missing-email=ignore fsck` would hide problems with missing emails in author, committer and tagger lines. In the same spirit that `git receive-pack`'s usage of the fsck machinery differs from `git fsck`'s – some of the non-fatal warnings in `git fsck` are fatal with `git receive-pack` when receive.fsckObjects = true, for example – we strictly separate the fsck.severity from the receive.fsck.severity settings. Signed-off-by: Johannes Schindelin <redacted> --- Documentation/config.txt | 12 ++++++++++++ builtin/fsck.c | 12 ++++++++++++ t/t1450-fsck.sh | 11 +++++++++++ 3 files changed, 35 insertions(+)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index f893492..4c0a13d 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt@@ -1208,6 +1208,18 @@ filter.<driver>.smudge:: object to a worktree file upon checkout. See linkgit:gitattributes[5] for details. +fsck.severity:: + A comma-separated lists of of the form `<id>=<level>` where `<id>` + denotes a fsck message ID such as `missing-email` and `<level>` is + one of `error`, `warn` and `ignore`. ++ +For convenience, fsck prefixes the error/warning with the message ID, +e.g. "missing-email: invalid author/committer line - missing email" means +that setting `fsck.severity = missing-email=ignore` will hide that issue. ++ +This feature is intended to support working with legacy repositories +which cannot be repaired without disruptive changes. + gc.aggressiveDepth:: The depth parameter used in the delta compression algorithm used by 'git gc --aggressive'. This defaults
diff --git a/builtin/fsck.c b/builtin/fsck.c
index 1f7944c..9e5cc31 100644
--- a/builtin/fsck.c
+++ b/builtin/fsck.c@@ -46,6 +46,16 @@ static int show_dangling = 1; #define DIRENT_SORT_HINT(de) ((de)->d_ino) #endif +static int fsck_config(const char *var, const char *value, void *cb) +{ + if (strcmp(var, "fsck.severity") == 0) { + fsck_set_severity(&fsck_obj_options, value); + return 0; + } + + return git_default_config(var, value, cb); +} + static void objreport(struct object *obj, const char *severity, const char *err) {
@@ -638,6 +648,8 @@ int cmd_fsck(int argc, const char **argv, const char *prefix) include_reflogs = 0; } + git_config(fsck_config, NULL); + fsck_head_link(); fsck_object_dir(get_object_directory());
diff --git a/t/t1450-fsck.sh b/t/t1450-fsck.sh
index ea0f216..0f15b74 100755
--- a/t/t1450-fsck.sh
+++ b/t/t1450-fsck.sh@@ -287,6 +287,17 @@ test_expect_success 'rev-list --verify-objects with bad sha1' ' grep -q "error: sha1 mismatch 63ffffffffffffffffffffffffffffffffffffff" out ' +test_expect_success 'force fsck to ignore double author' ' + git cat-file commit HEAD >basis && + sed "s/^author .*/&,&/" <basis | tr , \\n >multiple-authors && + new=$(git hash-object -t commit -w --stdin <multiple-authors) && + test_when_finished "remove_object $new" && + git update-ref refs/heads/bogus "$new" && + test_when_finished "git update-ref -d refs/heads/bogus" && + test_must_fail git fsck && + git -c fsck.severity=multiple-authors=ignore fsck +' + _bz='\0' _bz5="$_bz$_bz$_bz$_bz$_bz" _bz20="$_bz5$_bz5$_bz5$_bz5"
--
2.2.0.33.gc18b867