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

diff --git a/t/t7810-grep.sh b/t/t7810-grep.sh
index 46aaebc475e589babb49780889e65858ca5d2cf0..40615debc42479970c6a38565b71227bcf7f27c8 100755 (executable)
--- a/t/t7810-grep.sh
+++ b/t/t7810-grep.sh
@@ -328,6 +328,18 @@ do
                        grep "a+b*c" $H ab >actual &&
                test_cmp expected actual
        '
+
+       test_expect_success "grep --count $L" '
+               echo ${HC}ab:3 >expected &&
+               git grep --count -e b $H -- ab >actual &&
+               test_cmp expected actual
+       '
+
+       test_expect_success "grep --count -h $L" '
+               echo 3 >expected &&
+               git grep --count -h -e b $H -- ab >actual &&
+               test_cmp expected actual
+       '
 done
 
 cat >expected <<EOF
@@ -1084,11 +1096,6 @@ test_expect_success 'grep -E pattern with grep.patternType=fixed' '
        test_cmp expected actual
 '
 
-test_config() {
-       git config "$1" "$2" &&
-       test_when_finished "git config --unset $1"
-}
-
 cat >expected <<EOF
 hello.c<RED>:<RESET>int main(int argc, const char **argv)
 hello.c<RED>-<RESET>{