Merge branch 'maint'

diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh
index 579ddb7572c27889060da315ddecb773b6fa1272..8c12c65c72658acb37fa715fc93756381bc824bb 100755 (executable)
--- a/t/t9001-send-email.sh
+++ b/t/t9001-send-email.sh
@@ -23,6 +23,7 @@ test_expect_success $PREREQ \
       echo do
       echo "  echo \"!\$a!\""
       echo "done >commandline\$output"
+      test_have_prereq MINGW && echo "dos2unix commandline\$output"
       echo "cat > msgtxt\$output"
       ) >fake.sendmail &&
      chmod +x ./fake.sendmail &&
@@ -1168,4 +1169,32 @@ test_expect_success $PREREQ '--force sends cover letter template anyway' '
        test -n "$(ls msgtxt*)"
 '
 
+test_expect_success $PREREQ 'sendemail.aliasfiletype=mailrc' '
+       clean_fake_sendmail &&
+       echo "alias sbd  somebody@example.org" >.mailrc &&
+       git config --replace-all sendemail.aliasesfile "$(pwd)/.mailrc" &&
+       git config sendemail.aliasfiletype mailrc &&
+       git send-email \
+         --from="Example <nobody@example.com>" \
+         --to=sbd \
+         --smtp-server="$(pwd)/fake.sendmail" \
+         outdir/0001-*.patch \
+         2>errors >out &&
+       grep "^!somebody@example\.org!$" commandline1
+'
+
+test_expect_success $PREREQ 'sendemail.aliasfile=~/.mailrc' '
+       clean_fake_sendmail &&
+       echo "alias sbd  someone@example.org" >~/.mailrc &&
+       git config --replace-all sendemail.aliasesfile "~/.mailrc" &&
+       git config sendemail.aliasfiletype mailrc &&
+       git send-email \
+         --from="Example <nobody@example.com>" \
+         --to=sbd \
+         --smtp-server="$(pwd)/fake.sendmail" \
+         outdir/0001-*.patch \
+         2>errors >out &&
+       grep "^!someone@example\.org!$" commandline1
+'
+
 test_done