Merge branch 'km/imap-send-libcurl-options'

diff --git a/t/t7102-reset.sh b/t/t7102-reset.sh
index ee703bed64cc7572cb9a86fce2b0157026475709..98bcfe21aa3b6088a228593c627821a7f2740407 100755 (executable)
--- a/t/t7102-reset.sh
+++ b/t/t7102-reset.sh
@@ -44,7 +44,9 @@ test_expect_success 'creating initial files and commits' '
 
        echo "1st line 2nd file" >secondfile &&
        echo "2nd line 2nd file" >>secondfile &&
-       git -c "i18n.commitEncoding=$test_encoding" commit -a -m "$(commit_msg $test_encoding)" &&
+       # "git commit -m" would break MinGW, as Windows refuse to pass
+       # $test_encoding encoded parameter to git.
+       commit_msg $test_encoding | git -c "i18n.commitEncoding=$test_encoding" commit -a -F - &&
        head5=$(git rev-parse --verify HEAD)
 '
 # git log --pretty=oneline # to see those SHA1 involved
@@ -334,7 +336,9 @@ test_expect_success 'redoing the last two commits should succeed' '
 
        echo "1st line 2nd file" >secondfile &&
        echo "2nd line 2nd file" >>secondfile &&
-       git -c "i18n.commitEncoding=$test_encoding" commit -a -m "$(commit_msg $test_encoding)" &&
+       # "git commit -m" would break MinGW, as Windows refuse to pass
+       # $test_encoding encoded parameter to git.
+       commit_msg $test_encoding | git -c "i18n.commitEncoding=$test_encoding" commit -a -F - &&
        check_changes $head5
 '