diff options
| author | Antoine Pelisse <apelisse@gmail.com> | 2013-08-23 17:48:31 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-08-25 09:17:39 +0400 |
| commit | ea16794e4303e79f8acb01a93fb6b1762972ab86 (patch) | |
| tree | b7cfced09a5db569eccaf9d40a00a41603ef8389 /t/t4203-mailmap.sh | |
| parent | 0d8beaa5b76e824c9869f0d1f1b19ec7acf4982f (diff) | |
commit: search author pattern against 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/t4203-mailmap.sh')
| -rwxr-xr-x | t/t4203-mailmap.sh | 11 |
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 |