delta/git.git, branch js/fsck-opt

fsck: support ignoring objects in `git fsck` via fsck.skiplist

2015-06-23T21:27:37+00:00

Identical to support in `git receive-pack for the config option
`receive.fsck.skiplist`, we now support ignoring given objects in
`git fsck` via `fsck.skiplist` 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 
Signed-off-by: Junio C Hamano

fsck: git receive-pack: support excluding objects from fsck'ing

2015-06-23T21:27:37+00:00

The optional new config option `receive.fsck.skipList` specifies the path
to a file listing the names, i.e. SHA-1s, one per line, of objects that
are to be ignored by `git receive-pack` when `receive.fsckObjects = true`.

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).

The intended use case is for server administrators to inspect objects
that are reported by `git push` as being too problematic to enter the
repository, and to add the objects' SHA-1 to a (preferably sorted) file
when the objects are legitimate, i.e. when it is determined that those
problematic objects should be allowed to enter the server.

Signed-off-by: Johannes Schindelin 
Signed-off-by: Junio C Hamano

fsck: introduce `git fsck --connectivity-only`

2015-06-23T21:27:37+00:00

This option avoids unpacking each and all blob objects, and just
verifies the connectivity. In particular with large repositories, this
speeds up the operation, at the expense of missing corrupt blobs,
ignoring unreachable objects and other fsck issues, if any.

Signed-off-by: Johannes Schindelin 
Signed-off-by: Junio C Hamano

fsck: support demoting errors to warnings

2015-06-23T21:27:36+00:00

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.missingEmail=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. from the
receive.fsck. settings.

Signed-off-by: Johannes Schindelin 
Signed-off-by: Junio C Hamano

fsck: document the new receive.fsck. options

2015-06-23T21:27:36+00:00

Signed-off-by: Johannes Schindelin 
Signed-off-by: Junio C Hamano

fsck: allow upgrading fsck warnings to errors

2015-06-23T21:27:36+00:00

The 'invalid tag name' and 'missing tagger entry' warnings can now be
upgraded to errors by specifying `invalidTagName` and
`missingTaggerEntry` in the receive.fsck. config setting.

Incidentally, the missing tagger warning is now really shown as a warning
(as opposed to being reported with the "error:" prefix, as it used to be
the case before this commit).

Signed-off-by: Johannes Schindelin 
Signed-off-by: Junio C Hamano

fsck: optionally ignore specific fsck issues completely

2015-06-23T21:27:36+00:00

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 message type to "ignore".

This change "abuses" the missingEmail=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 
Signed-off-by: Junio C Hamano

fsck: disallow demoting grave fsck errors to warnings

2015-06-23T21:27:36+00:00

Some kinds of errors are intrinsically unrecoverable (e.g. errors while
uncompressing objects). It does not make sense to allow demoting them to
mere warnings.

Signed-off-by: Johannes Schindelin 
Signed-off-by: Junio C Hamano

fsck: add a simple test for receive.fsck.

2015-06-23T21:27:36+00:00

Signed-off-by: Johannes Schindelin 
Signed-off-by: Junio C Hamano

fsck: make fsck_tag() warn-friendly

2015-06-23T21:27:35+00:00

When fsck_tag() identifies a problem with the commit, it should try
to make it possible to continue checking the commit object, in case the
user wants to demote the detected errors to mere warnings.

Just like fsck_commit(), there are certain problems that could hide other
issues with the same tag object. For example, if the 'type' line is not
encountered in the correct position, the 'tag' line – if there is any –
would not be handled at all.

Signed-off-by: Johannes Schindelin 
Signed-off-by: Junio C Hamano