Two tests in t4203-mailmap.sh set up the mapping <bugs@xxxxxxxxxx> =>
<bugs@xxxxxxxxxx> in an apparent attempt to check that email address
remapping works as expected (in addition to name remapping which is also
tested). To test the remapping, git-shortlog is invoked but the
invocation lacks the -e option instructing it to show email addresses,
hence the tests do not actually prove that address remapping succeeded.
Fix this by instructing git-shortlog to output email addresses as well.
Signed-off-by: Eric Sunshine <sunshine@xxxxxxxxxxxxxx>
---
The very last git-shortlog "complex" test in the script does use -e and
checks that email address remapping actually works, so it's not clear
that this patch is needed. The <bugs@xxxxxxxxxx> => <bugs@xxxxxxxxxx>
remapping done by the two tests touched by this patch, however, is
misleading to the reader since it seems to imply that these two tests
want to check address remapping as well. Perhaps a better change would
be to remove the address remapping from these two tests.
t/t4203-mailmap.sh | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/t/t4203-mailmap.sh b/t/t4203-mailmap.sh
index 842b754..3cf64de 100755
--- a/t/t4203-mailmap.sh
+++ b/t/t4203-mailmap.sh
@@ -102,10 +102,10 @@ test_expect_success 'mailmap.file non-existent' '
'
cat >expect <<\EOF
-Internal Guy (1):
+Internal Guy <bugs@xxxxxxxxxx> (1):
second
-Repo Guy (1):
+Repo Guy <author@xxxxxxxxxxx> (1):
initial
EOF
@@ -114,15 +114,15 @@ test_expect_success 'name entry after email entry' '
mkdir -p internal_mailmap &&
echo "<bugs@xxxxxxxxxx> <bugs@xxxxxxxxxx>" >internal_mailmap/.mailmap &&
echo "Internal Guy <bugs@xxxxxxxxxx>" >>internal_mailmap/.mailmap &&
- git shortlog HEAD >actual &&
+ git shortlog -e HEAD >actual &&
test_cmp expect actual
'
cat >expect <<\EOF
-Internal Guy (1):
+Internal Guy <bugs@xxxxxxxxxx> (1):
second
-Repo Guy (1):
+Repo Guy <author@xxxxxxxxxxx> (1):
initial
EOF
@@ -131,7 +131,7 @@ test_expect_success 'name entry after email entry, case-insensitive' '
mkdir -p internal_mailmap &&
echo "<bugs@xxxxxxxxxx> <bugs@xxxxxxxxxx>" >internal_mailmap/.mailmap &&
echo "Internal Guy <BUGS@xxxxxxxxxx>" >>internal_mailmap/.mailmap &&
- git shortlog HEAD >actual &&
+ git shortlog -e HEAD >actual &&
test_cmp expect actual
'
--
1.8.3.2.804.g0da7a53
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html