diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-06-02 19:05:08 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-06-02 19:05:08 (GMT) |
| commit | 86eff8c512b96ce3ee0ae5818edfa035b98cdf08 (patch) | |
| tree | 0d562bf2e10356ca6b085787dd726c430e680436 /t | |
| parent | 302665473cfe233516cc4c29a1a0359153e5506d (diff) | |
| parent | 996e2d6ea2626f55a59e70ac7305a02ce0171814 (diff) | |
| download | git-86eff8c512b96ce3ee0ae5818edfa035b98cdf08.zip git-86eff8c512b96ce3ee0ae5818edfa035b98cdf08.tar.gz git-86eff8c512b96ce3ee0ae5818edfa035b98cdf08.tar.bz2 | |
Merge branch 'maint'
* maint:
Use =20 when rfc2047 encoding spaces.
Create a new manpage for the gitignore format, and reference it elsewhere
Documentation: robustify asciidoc GIT_VERSION replacement
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3901-i18n-patch.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/t/t3901-i18n-patch.sh b/t/t3901-i18n-patch.sh index a881797..24bf0ee 100755 --- a/t/t3901-i18n-patch.sh +++ b/t/t3901-i18n-patch.sh @@ -13,7 +13,7 @@ check_encoding () { while test "$i" -le $cnt do git format-patch --encoding=UTF-8 --stdout HEAD~$i..HEAD~$j | - grep "^From: =?UTF-8?q?=C3=81=C3=A9=C3=AD_=C3=B3=C3=BA?=" && + grep "^From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?=" && git-cat-file commit HEAD~$j | case "$header" in 8859) @@ -73,9 +73,9 @@ test_expect_success 'format-patch output (ISO-8859-1)' ' git format-patch --stdout master..HEAD^ >out-l1 && git format-patch --stdout HEAD^ >out-l2 && grep "^Content-Type: text/plain; charset=ISO-8859-1" out-l1 && - grep "^From: =?ISO-8859-1?q?=C1=E9=ED_=F3=FA?=" out-l1 && + grep "^From: =?ISO-8859-1?q?=C1=E9=ED=20=F3=FA?=" out-l1 && grep "^Content-Type: text/plain; charset=ISO-8859-1" out-l2 && - grep "^From: =?ISO-8859-1?q?=C1=E9=ED_=F3=FA?=" out-l2 + grep "^From: =?ISO-8859-1?q?=C1=E9=ED=20=F3=FA?=" out-l2 ' test_expect_success 'format-patch output (UTF-8)' ' @@ -84,9 +84,9 @@ test_expect_success 'format-patch output (UTF-8)' ' git format-patch --stdout master..HEAD^ >out-u1 && git format-patch --stdout HEAD^ >out-u2 && grep "^Content-Type: text/plain; charset=UTF-8" out-u1 && - grep "^From: =?UTF-8?q?=C3=81=C3=A9=C3=AD_=C3=B3=C3=BA?=" out-u1 && + grep "^From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?=" out-u1 && grep "^Content-Type: text/plain; charset=UTF-8" out-u2 && - grep "^From: =?UTF-8?q?=C3=81=C3=A9=C3=AD_=C3=B3=C3=BA?=" out-u2 + grep "^From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?=" out-u2 ' test_expect_success 'rebase (U/U)' ' |