format-patch: respect --stat in cover letter's diffstat

diff --git a/t/t5615-alternate-env.sh b/t/t5615-alternate-env.sh
index 26ebb0375deb67be38974c7c5610f090a5a2a9aa..b4905b822c07048ddfbc43cfd39265bd2116f197 100755 (executable)
--- a/t/t5615-alternate-env.sh
+++ b/t/t5615-alternate-env.sh
@@ -7,9 +7,9 @@ check_obj () {
        alt=$1; shift
        while read obj expect
        do
-               echo "$obj" >&3 &&
-               echo "$obj $expect" >&4
-       done 3>input 4>expect &&
+               echo "$obj" >&5 &&
+               echo "$obj $expect" >&6
+       done 5>input 6>expect &&
        GIT_ALTERNATE_OBJECT_DIRECTORIES=$alt \
                git "$@" cat-file --batch-check='%(objectname) %(objecttype)' \
                <input >actual &&
@@ -77,6 +77,7 @@ test_expect_success 'mix of quoted and unquoted alternates' '
        check_obj "$quoted:$unquoted" <<-EOF
        $one blob
        $two blob
+       EOF
 '
 
 test_expect_success !MINGW 'broken quoting falls back to interpreting raw' '