summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorAntoine Pelisse <apelisse@gmail.com>2013-08-23 15:48:31 +0200
committerJunio C Hamano <gitster@pobox.com>2013-08-24 22:17:39 -0700
commitea16794e4303e79f8acb01a93fb6b1762972ab86 (patch)
treeb7cfced09a5db569eccaf9d40a00a41603ef8389 /t
parent0d8beaa5b76e824c9869f0d1f1b19ec7acf4982f (diff)
downloadgit-ap/commit-author-mailmap.tar.gz
commit: search author pattern against mailmapap/commit-author-mailmap
"git commit --author=$name" sets the author to one whose name matches the given string from existing commits, when $name is not in the "Name <e-mail>" format. However, it does not honor the mailmap to use the canonical name for the author found this way. Fix it by telling the logic to find a matching existing author to honor the mailmap, and use the name and email after applying the mailmap. Signed-off-by: Antoine Pelisse <apelisse@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
-rwxr-xr-xt/t4203-mailmap.sh11
1 files changed, 11 insertions, 0 deletions
diff --git a/t/t4203-mailmap.sh b/t/t4203-mailmap.sh
index baa4685dcc..4d715f058c 100755
--- a/t/t4203-mailmap.sh
+++ b/t/t4203-mailmap.sh
@@ -470,4 +470,15 @@ test_expect_success 'Blame output (complex mapping)' '
test_cmp expect actual.fuzz
'
+cat >expect <<\EOF
+Some Dude <some@dude.xx>
+EOF
+
+test_expect_success 'commit --author honors mailmap' '
+ test_must_fail git commit --author "nick" --allow-empty -meight &&
+ git commit --author "Some Dude" --allow-empty -meight &&
+ git show --pretty=format:"%an <%ae>%n" >actual &&
+ test_cmp expect actual
+'
+
test_done