send-email: handle adjacent RFC 2047-encoded words properly

diff --git a/t/t1302-repo-version.sh b/t/t1302-repo-version.sh
index a6bf1bf4d6182f0883ea858e28aa8a9b3dd79024..0d9388afc4e20a5c536d214bfe25e630242ed667 100755 (executable)
--- a/t/t1302-repo-version.sh
+++ b/t/t1302-repo-version.sh
@@ -19,7 +19,7 @@ test_expect_success 'setup' '
 
        test_create_repo "test" &&
        test_create_repo "test2" &&
-       GIT_CONFIG=test2/.git/config git config core.repositoryformatversion 99
+       git config --file=test2/.git/config core.repositoryformatversion 99
 '
 
 test_expect_success 'gitdir selection on normal repos' '
@@ -39,7 +39,7 @@ test_expect_success 'gitdir selection on unsupported repo' '
        (
                cd test2 &&
                git config core.repositoryformatversion >../actual
-       )
+       ) &&
        test_cmp expect actual
 '