diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-09-17 11:38:33 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-09-17 11:38:33 -0700 |
| commit | 5aebc9a8deb1c8c83537bae72f14585e44f51787 (patch) | |
| tree | 14ec3c578337afe2f8ac7d58285e532eb41821df /t/t4203-mailmap.sh | |
| parent | b8f23112f0415cc86eb0ec576ac7e16c7c9d78b8 (diff) | |
| parent | ea16794e4303e79f8acb01a93fb6b1762972ab86 (diff) | |
| download | git-5aebc9a8deb1c8c83537bae72f14585e44f51787.tar.gz git-5aebc9a8deb1c8c83537bae72f14585e44f51787.tar.xz | |
Merge branch 'ap/commit-author-mailmap'
"git commit --author=$name", when $name is not in the canonical
"A. U. Thor <au.thor@example.xz>" format, looks for a matching name
from existing history, but did not consult mailmap to grab the
preferred author name.
* ap/commit-author-mailmap:
commit: search author pattern against mailmap
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 ce3eace06..0dd8b65d7 100755 --- a/t/t4203-mailmap.sh +++ b/t/t4203-mailmap.sh @@ -484,4 +484,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 |