diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-10-17 15:45:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-10-17 15:45:52 -0700 |
| commit | 87b24a42eae8f33ccf28d0babbe91f0262feb7dc (patch) | |
| tree | 25c2c9b77dad4341668def390fc45446a07d2aea /t | |
| parent | f8a3fd28fd9e61852f5944335e7338c52c8c5abd (diff) | |
| parent | ea16794e4303e79f8acb01a93fb6b1762972ab86 (diff) | |
| download | git-87b24a42eae8f33ccf28d0babbe91f0262feb7dc.tar.gz git-87b24a42eae8f33ccf28d0babbe91f0262feb7dc.tar.xz | |
Merge branch 'ap/commit-author-mailmap' into maint
* ap/commit-author-mailmap:
commit: search author pattern against mailmap
Diffstat (limited to 't')
| -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 |