From: Dmitry Ivankov Date: Thu, 28 Jul 2011 05:44:04 GMT Subject: [PATCH 5/5] fsck: improve committer/author check Message-ID: <1311831844-13123-6-git-send-email-divanorama@gmail.com> In-Reply-To: <1311831844-13123-1-git-send-email-divanorama@gmail.com> Neither name nor email should contain < or >, so split the string with these and check they come in that order and < is preceeded with a space. If < is missing don't say a confusing "missing space", say "bad name" if > isn't missing and "missing email" if both < and > are missing. Signed-off-by: Dmitry Ivankov --- fsck.c | 10 ++++++---- t/t1450-fsck.sh | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/fsck.c b/fsck.c index 60bd4bb..6c855f8 100644 --- a/fsck.c +++ b/fsck.c @@ -224,13 +224,15 @@ static int fsck_tree(struct tree *item, int strict, fsck_error error_func) static int fsck_ident(char **ident, struct object *obj, fsck_error error_func) { - if (**ident == '<' || **ident == '\n') - return error_func(obj, FSCK_ERROR, "invalid author/committer line - missing space before email"); - *ident += strcspn(*ident, "<\n"); - if ((*ident)[-1] != ' ') + if (**ident == '<') return error_func(obj, FSCK_ERROR, "invalid author/committer line - missing space before email"); + *ident += strcspn(*ident, "<>\n"); + if (**ident == '>') + return error_func(obj, FSCK_ERROR, "invalid author/committer line - bad name"); if (**ident != '<') return error_func(obj, FSCK_ERROR, "invalid author/committer line - missing email"); + if ((*ident)[-1] != ' ') + return error_func(obj, FSCK_ERROR, "invalid author/committer line - missing space before email"); (*ident)++; *ident += strcspn(*ident, "<>\n"); if (**ident != '>') diff --git a/t/t1450-fsck.sh b/t/t1450-fsck.sh index fc7ee8e..0b92d0f 100755 --- a/t/t1450-fsck.sh +++ b/t/t1450-fsck.sh @@ -110,7 +110,7 @@ test_expect_success 'email with embedded > is not okay' ' grep "error in commit $new" out ' -test_expect_failure 'missing < email delimiter is reported nicely' ' +test_expect_success 'missing < email delimiter is reported nicely' ' git cat-file commit HEAD >basis && sed "s/bad-email-2 && new=$(git hash-object -t commit -w --stdin in name is reported' ' +test_expect_success '> in name is reported' ' git cat-file commit HEAD >basis && sed "s/ bad-email-3 && new=$(git hash-object -t commit -w --stdin