[PATCH v3 19/19] fsck: support ignoring objects in `git fsck` via fsck.skiplist
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Jan 21, 2015, 19:27 UTC
- Message-ID
- <fe744590eab4ee0b9ba25ac3473d93ab581956aa.1421868116.git.johannes.schindelin@gmx.de>
- In-Reply-To
- <cover.1421868116.git.johannes.schindelin@gmx.de>
Identical to support in `git receive-pack for the config option `receive.fsck.skiplist`, we now support ignoring given objects in `git fsck` altogether.
This is extremely handy in case of legacy repositories where it would cause more pain to change incorrect objects than to live with them (e.g. a duplicate 'author' line in an early commit object).
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> --- Documentation/config.txt | 7 +++++++ builtin/fsck.c | 10 ++++++++++ 2 files changed, 17 insertions(+)
diff --git a/Documentation/config.txt b/Documentation/config.txt index 636adff..644411a 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1223,6 +1223,13 @@ that setting `fsck.ignore = missing-email` will hide that issue. This feature is intended to support working with legacy repositories which cannot be repaired without disruptive changes. +fsck.skipList:: + The path to a sorted list of object names (i.e. one SHA-1 per + line) that are known to be broken in a non-fatal way and should + be ignored. This feature is useful when an established project + should be accepted despite early commits containing errors that + can be safely ignored such as invalid committer email addresses. + 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 7ae4715..760b4bd 100644 --- a/builtin/fsck.c +++ b/builtin/fsck.c @@ -49,6 +49,16 @@ static int show_dangling = 1; static int fsck_config(const char *var, const char *value, void *cb) { + if (strcmp(var, "receive.fsck.skiplist") == 0) { + const char *path = is_absolute_path(value) ? + value : git_path("%s", value); + struct strbuf sb = STRBUF_INIT; + strbuf_addf(&sb, "skiplist=%s", path); + fsck_set_severity(&fsck_obj_options, sb.buf); + strbuf_release(&sb); + return 0; + } + if (skip_prefix(var, "fsck.", &var)) { struct strbuf sb = STRBUF_INIT; strbuf_addf(&sb, "%s=%s", var, value);
-- 2.2.0.33.gc18b867