From 0adc6a3d49a46436780b2dd636918c9840d82236 Mon Sep 17 00:00:00 2001 From: Jonathan Nieder Date: Wed, 26 May 2010 16:50:34 -0500 Subject: [PATCH] fsck: fix bogus commit header check MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit daae1922 (fsck: check ident lines in commit objects, 2010-04-24) taught fsck to expect commit objects to have the form tree author committer log message The check is overly strict: for example, it errors out with the message “expected blank line” for perfectly valid commits with an "encoding ISO-8859-1" line. Later it might make sense to teach fsck about the rest of the header and warn about unrecognized header lines, but for simplicity, let’s accept arbitrary trailing lines for now. Reported-by: Tuncer Ayaz Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano --- fsck.c | 2 -- t/t1450-fsck.sh | 8 ++++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/fsck.c b/fsck.c index ae9ae1abe..3d05d4a79 100644 --- a/fsck.c +++ b/fsck.c @@ -311,8 +311,6 @@ static int fsck_commit(struct commit *commit, fsck_error error_func) err = fsck_ident(&buffer, &commit->object, error_func); if (err) return err; - if (*buffer != '\n') - return error_func(&commit->object, FSCK_ERROR, "invalid format - expected blank line"); if (!commit->tree) return error_func(&commit->object, FSCK_ERROR, "could not load commit's tree %s", sha1_to_hex(tree_sha1)); diff --git a/t/t1450-fsck.sh b/t/t1450-fsck.sh index 22a80c826..759cf12e1 100755 --- a/t/t1450-fsck.sh +++ b/t/t1450-fsck.sh @@ -5,7 +5,9 @@ test_description='git fsck random collection of tests' . ./test-lib.sh test_expect_success setup ' + git config i18n.commitencoding ISO-8859-1 && test_commit A fileA one && + git config --unset i18n.commitencoding && git checkout HEAD^0 && test_commit B fileB two && git tag -d A B && @@ -28,6 +30,12 @@ test_expect_success 'loose objects borrowed from alternate are not missing' ' ) ' +test_expect_success 'valid objects appear valid' ' + { git fsck 2>out; true; } && + ! grep error out && + ! grep fatal out +' + # Corruption tests follow. Make sure to remove all traces of the # specific corruption you test afterwards, lest a later test trip over # it. -- 2.30.2