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

diff --git a/t/t9125-git-svn-multi-glob-branch-names.sh b/t/t9125-git-svn-multi-glob-branch-names.sh
index 096abd1fe5e37444a442e698a5d5734823a45798..0d53fc901497f49e95bf2644b31baf144aac8376 100755 (executable)
--- a/t/t9125-git-svn-multi-glob-branch-names.sh
+++ b/t/t9125-git-svn-multi-glob-branch-names.sh
@@ -20,14 +20,14 @@ test_expect_success 'test clone with multi-glob in branch names' '
        git svn clone -T trunk -b branches/*/* -t tags \
                      "$svnrepo/project" project &&
        (cd project &&
-               git rev-parse "refs/remotes/v14.1/beta" &&
-               git rev-parse "refs/remotes/v14.1/gold"
+               git rev-parse "refs/remotes/origin/v14.1/beta" &&
+               git rev-parse "refs/remotes/origin/v14.1/gold"
        )
        '
 
 test_expect_success 'test dcommit to multi-globbed branch' "
        (cd project &&
-       git reset --hard 'refs/remotes/v14.1/gold' &&
+       git reset --hard 'refs/remotes/origin/v14.1/gold' &&
        echo hello >> foo &&
        git commit -m 'hello' -- foo &&
        git svn dcommit