From: Junio C Hamano <[email protected]>
In parse_name_and_email() function, there is this line:
*name = (nstart < nend ? nstart : NULL);
When the function is given a buffer "A <[email protected]> <[email protected]>",
nstart scans from the beginning of the buffer, skipping whitespaces
(there isn't any, so nstart points at the buffer), while nend starts
from one byte before the first '<' and skips whitespaces backwards
and stops at the first non-whitespace (i.e. it hits "A" at the
beginning of the buffer). nstart == nend in this case for a
single-letter name, and an off-by-one error makes it fail to pick up
the name, which makes the entry equivalent to
<[email protected]> <[email protected]>
without the name.
Signed-off-by: Junio C Hamano <[email protected]>
Signed-off-by: Eric Sunshine <[email protected]>
---
mailmap.c | 2 +-
t/t4203-mailmap.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/mailmap.c b/mailmap.c
index 2a7b366..418081e 100644
--- a/mailmap.c
+++ b/mailmap.c
@@ -122,7 +122,7 @@ static char *parse_name_and_email(char *buffer, char **name,
while (nend > nstart && isspace(*nend))
--nend;
- *name = (nstart < nend ? nstart : NULL);
+ *name = (nstart <= nend ? nstart : NULL);
*email = left+1;
*(nend+1) = '\0';
*right++ = '\0';
diff --git a/t/t4203-mailmap.sh b/t/t4203-mailmap.sh
index 27f8f86..8583724 100755
--- a/t/t4203-mailmap.sh
+++ b/t/t4203-mailmap.sh
@@ -247,7 +247,7 @@ test_expect_success 'cleanup after mailmap.blob tests' '
rm -f .mailmap
'
-test_expect_failure 'single-character name' '
+test_expect_success 'single-character name' '
echo " 1 A <[email protected]>" >expect &&
echo " 1 nick1 <[email protected]>" >>expect &&
echo "A <[email protected]>" >.mailmap &&
--
1.8.3.2.804.g0da7a53
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
