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.missing-email=ignore fsck` would hide problems with missing emails in author, committer and tagger lines. Signed-off-by: Johannes Schindelin <johannes.schinde...@gmx.de> --- Documentation/config.txt | 13 +++++++++++++ builtin/fsck.c | 15 +++++++++++++++ t/t1450-fsck.sh | 11 +++++++++++ 3 files changed, 39 insertions(+) diff --git a/Documentation/config.txt b/Documentation/config.txt index b3276ee..fa58c26 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1192,6 +1192,19 @@ filter.<driver>.smudge:: object to a worktree file upon checkout. See linkgit:gitattributes[5] for details. +fsck.*:: + With these options, fsck errors can be switched to warnings and + vice versa by setting e.g. `fsck.bad-name` to `warn` or `error` + (or `ignore` to hide those errors completely). For convenience, + fsck prefixes the error/warning with the name of the option, e.g. + "missing-email: invalid author/committer line - missing email" + means that setting `fsck.missing-email` to `ignore` will hide that + issue. For convenience, camelCased options are accepted, too (e.g. + `fsck.missingEmail`). ++ +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 99d4538..2b8faa4 100644 --- a/builtin/fsck.c +++ b/builtin/fsck.c @@ -46,6 +46,19 @@ 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 (starts_with(var, "fsck.")) { + struct strbuf sb = STRBUF_INIT; + strbuf_addf(&sb, "%s=%s", var + 5, value ? value : "error"); + fsck_strict_mode(&fsck_obj_options, sb.buf); + strbuf_release(&sb); + return 0; + } + + return git_default_config(var, value, cb); +} + static void objreport(struct object *obj, const char *severity, const char *err) { @@ -638,6 +651,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 019fddd..d74df19 100755 --- a/t/t1450-fsck.sh +++ b/t/t1450-fsck.sh @@ -283,6 +283,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.multiple-authors=ignore fsck +' + _bz='\0' _bz5="$_bz$_bz$_bz$_bz$_bz" _bz20="$_bz5$_bz5$_bz5$_bz5" -- 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