kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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
maint
Junio C Hamano 2023-08-09 16:18:15 -07:00
parent 889c94d2a0 1c04cb0744
commit cf07e53bae
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ident.c
View File

@ -203,7 +203,6 @@ void reset_ident_date(void)
static int crud(unsigned char c) static int crud(unsigned char c)
{ {
return c <= 32 || return c <= 32 ||
c == '.' ||
c == ',' || c == ',' ||
c == ':' || c == ':' ||
c == ';' || c == ';' ||

4
t/t4203-mailmap.sh
View File

@ -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)> 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> 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> Committer C O Mitter <committer@example.com> maps to C O Mitter <committer@example.com>
EOF EOF
git -C doc log --reverse --pretty=format:"Author %an <%ae> maps to %aN <%aE>%nCommitter %cn <%ce> maps to %cN <%cE>%n" >actual && 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> 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> 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> Committer C O Mitter <committer@example.com> maps to C O Mitter <committer@example.com>
EOF EOF
git -C doc log --reverse --pretty=format:"Author %an <%ae> maps to %aN <%aE>%nCommitter %cn <%ce> maps to %cN <%cE>%n" >actual && git -C doc log --reverse --pretty=format:"Author %an <%ae> maps to %aN <%aE>%nCommitter %cn <%ce> maps to %cN <%cE>%n" >actual &&

11
t/t7518-ident-corner-cases.sh
View File

@ -20,10 +20,19 @@ test_expect_success 'empty name and missing email' '
' '


test_expect_success 'commit rejects all-crud name' ' 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 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 # We must test the actual error message here, as an unwanted
# auto-detection could fail for other reasons. # auto-detection could fail for other reasons.
test_expect_success 'empty configured name does not auto-detect' ' test_expect_success 'empty configured name does not auto-detect' '