This problem has been detected in the wild, and is the primary reason
to introduce an option to demote certain fsck errors to warnings. Let's
offer to ignore this particular problem specifically.
Technically, we could handle such repositories by setting
receive.fsck.severity to missing-committer=warn, but that could hide
missing tree objects in the same commit because we cannot continue
verifying any commit object after encountering a missing committer line,
while we can continue in the case of multiple author lines.
Signed-off-by: Johannes Schindelin <johannes.schinde...@gmx.de>
---
fsck.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/fsck.c b/fsck.c
index 7ce7857..b92d8c4 100644
--- a/fsck.c
+++ b/fsck.c
@@ -38,6 +38,7 @@
FUNC(MISSING_TREE, ERROR) \
FUNC(MISSING_TYPE, ERROR) \
FUNC(MISSING_TYPE_ENTRY, ERROR) \
+ FUNC(MULTIPLE_AUTHORS, ERROR) \
FUNC(NOT_SORTED, ERROR) \
FUNC(NUL_IN_HEADER, ERROR) \
FUNC(TAG_OBJECT_NOT_TAG, ERROR) \
@@ -551,6 +552,14 @@ static int fsck_commit_buffer(struct commit *commit, const
char *buffer,
err = fsck_ident(&buffer, &commit->object, options);
if (err)
return err;
+ while (skip_prefix(buffer, "author ", &buffer)) {
+ err = report(options, &commit->object,
FSCK_MSG_MULTIPLE_AUTHORS, "invalid format - multiple 'author' lines");
+ if (err)
+ return err;
+ err = fsck_ident(&buffer, &commit->object, options);
+ if (err)
+ return err;
+ }
if (!skip_prefix(buffer, "committer ", &buffer))
return report(options, &commit->object,
FSCK_MSG_MISSING_COMMITTER, "invalid format - expected 'committer' line");
err = fsck_ident(&buffer, &commit->object, options);
--
2.2.0.33.gc18b867
--
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
