Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
git2
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lvzhengyang
git2
Commits
307c4a2b
Commit
307c4a2b
authored
Oct 21, 2015
by
Vicent Marti
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
signature: Strip crud just like Git does
parent
4280fabb
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
24 additions
and
3 deletions
+24
-3
src/signature.c
+16
-2
tests/commit/signature.c
+7
-0
tests/revwalk/signatureparsing.c
+1
-1
No files found.
src/signature.c
View file @
307c4a2b
...
@@ -34,13 +34,27 @@ static bool contains_angle_brackets(const char *input)
...
@@ -34,13 +34,27 @@ static bool contains_angle_brackets(const char *input)
return
strchr
(
input
,
'<'
)
!=
NULL
||
strchr
(
input
,
'>'
)
!=
NULL
;
return
strchr
(
input
,
'<'
)
!=
NULL
||
strchr
(
input
,
'>'
)
!=
NULL
;
}
}
static
bool
is_crud
(
unsigned
char
c
)
{
return
c
<=
32
||
c
==
'.'
||
c
==
','
||
c
==
':'
||
c
==
';'
||
c
==
'<'
||
c
==
'>'
||
c
==
'"'
||
c
==
'\\'
||
c
==
'\''
;
}
static
char
*
extract_trimmed
(
const
char
*
ptr
,
size_t
len
)
static
char
*
extract_trimmed
(
const
char
*
ptr
,
size_t
len
)
{
{
while
(
len
&&
git__isspace
(
ptr
[
0
]))
{
while
(
len
&&
is_crud
((
unsigned
char
)
ptr
[
0
]))
{
ptr
++
;
len
--
;
ptr
++
;
len
--
;
}
}
while
(
len
&&
git__isspace
(
ptr
[
len
-
1
]))
{
while
(
len
&&
is_crud
((
unsigned
char
)
ptr
[
len
-
1
]))
{
len
--
;
len
--
;
}
}
...
...
tests/commit/signature.c
View file @
307c4a2b
...
@@ -35,6 +35,13 @@ void test_commit_signature__leading_and_trailing_spaces_are_trimmed(void)
...
@@ -35,6 +35,13 @@ void test_commit_signature__leading_and_trailing_spaces_are_trimmed(void)
assert_name_and_email
(
"nulltoken"
,
"emeric.fermas@gmail.com"
,
"
\t
nulltoken
\n
"
,
"
\n
emeric.fermas@gmail.com
\n
"
);
assert_name_and_email
(
"nulltoken"
,
"emeric.fermas@gmail.com"
,
"
\t
nulltoken
\n
"
,
"
\n
emeric.fermas@gmail.com
\n
"
);
}
}
void
test_commit_signature__leading_and_trailing_crud_is_trimmed
(
void
)
{
assert_name_and_email
(
"nulltoken"
,
"emeric.fermas@gmail.com"
,
"
\"
nulltoken
\"
"
,
"
\"
emeric.fermas@gmail.com
\"
"
);
assert_name_and_email
(
"nulltoken w"
,
"emeric.fermas@gmail.com"
,
"nulltoken w."
,
"emeric.fermas@gmail.com"
);
assert_name_and_email
(
"nulltoken
\xe2\x98\xba
"
,
"emeric.fermas@gmail.com"
,
"nulltoken
\xe2\x98\xba
"
,
"emeric.fermas@gmail.com"
);
}
void
test_commit_signature__angle_brackets_in_names_are_not_supported
(
void
)
void
test_commit_signature__angle_brackets_in_names_are_not_supported
(
void
)
{
{
cl_git_fail
(
try_build_signature
(
"<Phil Haack"
,
"phil@haack"
,
1234567890
,
60
));
cl_git_fail
(
try_build_signature
(
"<Phil Haack"
,
"phil@haack"
,
1234567890
,
60
));
...
...
tests/revwalk/signatureparsing.c
View file @
307c4a2b
...
@@ -38,7 +38,7 @@ void test_revwalk_signatureparsing__do_not_choke_when_name_contains_angle_bracke
...
@@ -38,7 +38,7 @@ void test_revwalk_signatureparsing__do_not_choke_when_name_contains_angle_bracke
signature
=
git_commit_committer
(
commit
);
signature
=
git_commit_committer
(
commit
);
cl_assert_equal_s
(
"foo@example.com"
,
signature
->
email
);
cl_assert_equal_s
(
"foo@example.com"
,
signature
->
email
);
cl_assert_equal_s
(
"
<Yu V. Bin Haacked>
"
,
signature
->
name
);
cl_assert_equal_s
(
"
Yu V. Bin Haacked
"
,
signature
->
name
);
cl_assert_equal_i
(
1323847743
,
(
int
)
signature
->
when
.
time
);
cl_assert_equal_i
(
1323847743
,
(
int
)
signature
->
when
.
time
);
cl_assert_equal_i
(
60
,
signature
->
when
.
offset
);
cl_assert_equal_i
(
60
,
signature
->
when
.
offset
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment