Merge branch 'jt/sha1-file-cleanup'

diff --git a/t/t4203-mailmap.sh b/t/t4203-mailmap.sh
index ce3eace065be81612e1ab2f994909b9352d5a06c..0dd8b65d7cdec2ada739d7e0b524fd3c66dd5ef4 100755 (executable)
--- 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