зеркало из https://github.com/microsoft/git.git
Merge branch 'bc/ident-dot-is-no-longer-crud-letter'
Exclude "." from the set of characters to be removed from the beginning and the end of the human-readable name. * bc/ident-dot-is-no-longer-crud-letter: ident: don't consider '.' a crud
This commit is contained in:
Коммит
cf07e53bae
1
ident.c
1
ident.c
|
@ -203,7 +203,6 @@ void reset_ident_date(void)
|
|||
static int crud(unsigned char c)
|
||||
{
|
||||
return c <= 32 ||
|
||||
c == '.' ||
|
||||
c == ',' ||
|
||||
c == ':' ||
|
||||
c == ';' ||
|
||||
|
|
|
@ -466,7 +466,7 @@ test_expect_success 'gitmailmap(5) example output: example #1' '
|
|||
Author Jane Doe <jane@laptop.(none)> maps to Jane Doe <jane@laptop.(none)>
|
||||
Committer C O Mitter <committer@example.com> maps to C O Mitter <committer@example.com>
|
||||
|
||||
Author Jane D <jane@desktop.(none)> maps to Jane Doe <jane@desktop.(none)>
|
||||
Author Jane D. <jane@desktop.(none)> maps to Jane Doe <jane@desktop.(none)>
|
||||
Committer C O Mitter <committer@example.com> maps to C O Mitter <committer@example.com>
|
||||
EOF
|
||||
git -C doc log --reverse --pretty=format:"Author %an <%ae> maps to %aN <%aE>%nCommitter %cn <%ce> maps to %cN <%cE>%n" >actual &&
|
||||
|
@ -494,7 +494,7 @@ test_expect_success 'gitmailmap(5) example output: example #2' '
|
|||
Author Jane Doe <jane@laptop.(none)> maps to Jane Doe <jane@example.com>
|
||||
Committer C O Mitter <committer@example.com> maps to C O Mitter <committer@example.com>
|
||||
|
||||
Author Jane D <jane@desktop.(none)> maps to Jane Doe <jane@example.com>
|
||||
Author Jane D. <jane@desktop.(none)> maps to Jane Doe <jane@example.com>
|
||||
Committer C O Mitter <committer@example.com> maps to C O Mitter <committer@example.com>
|
||||
EOF
|
||||
git -C doc log --reverse --pretty=format:"Author %an <%ae> maps to %aN <%aE>%nCommitter %cn <%ce> maps to %cN <%cE>%n" >actual &&
|
||||
|
|
|
@ -20,10 +20,19 @@ test_expect_success 'empty name and missing email' '
|
|||
'
|
||||
|
||||
test_expect_success 'commit rejects all-crud name' '
|
||||
test_must_fail env GIT_AUTHOR_NAME=" .;<>" \
|
||||
test_must_fail env GIT_AUTHOR_NAME=" ,;<>" \
|
||||
git commit --allow-empty -m foo
|
||||
'
|
||||
|
||||
test_expect_success 'commit does not strip trailing dot' '
|
||||
author_name="Pat Doe Jr." &&
|
||||
env GIT_AUTHOR_NAME="$author_name" \
|
||||
git commit --allow-empty -m foo &&
|
||||
git log -1 --format=%an >actual &&
|
||||
echo "$author_name" >expected &&
|
||||
test_cmp actual expected
|
||||
'
|
||||
|
||||
# We must test the actual error message here, as an unwanted
|
||||
# auto-detection could fail for other reasons.
|
||||
test_expect_success 'empty configured name does not auto-detect' '
|
||||
|
|
Загрузка…
Ссылка в новой задаче