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

diff --git a/t/t5615-alternate-env.sh b/t/t5615-alternate-env.sh
index 63ef0b79952d9551e8c38496d19850eb02d7caab..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 &&
@@ -31,14 +31,14 @@ test_expect_success 'objects inaccessible without alternates' '
 '
 
 test_expect_success 'access alternate via absolute path' '
-       check_obj "$(pwd)/one.git/objects" <<-EOF
+       check_obj "$PWD/one.git/objects" <<-EOF
        $one blob
        $two missing
        EOF
 '
 
 test_expect_success 'access multiple alternates' '
-       check_obj "$(pwd)/one.git/objects:$(pwd)/two.git/objects" <<-EOF
+       check_obj "$PWD/one.git/objects:$PWD/two.git/objects" <<-EOF
        $one blob
        $two blob
        EOF