diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-11-20 09:57:44 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-11-20 09:57:44 -0800 |
| commit | fd778c09b1bb683d930dae59566bce79be89c628 (patch) | |
| tree | bf503a6773cfff44269a8c2cd6744672ca66432c /t/t4202-log.sh | |
| parent | 2808f6abc238ab038020681d43eaec7c0335efaa (diff) | |
| parent | 25dc8dad3a7c9f5426f549701e22eec1f894fec8 (diff) | |
| download | git-fd778c09b1bb683d930dae59566bce79be89c628.tar.gz git-fd778c09b1bb683d930dae59566bce79be89c628.tar.xz | |
Merge branch 'js/format-2047' into maint
Various rfc2047 quoting issues around a non-ASCII name on the From:
line in the output from format-patch have been corrected.
* js/format-2047:
format-patch tests: check quoting/encoding in To: and Cc: headers
format-patch: fix rfc2047 address encoding with respect to rfc822 specials
format-patch: make rfc2047 encoding more strict
format-patch: introduce helper function last_line_length()
format-patch: do not wrap rfc2047 encoded headers too late
format-patch: do not wrap non-rfc2047 headers too early
utf8: fix off-by-one wrapping of text
Diffstat (limited to 't/t4202-log.sh')
| -rwxr-xr-x | t/t4202-log.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t4202-log.sh b/t/t4202-log.sh index e6537abe1..a343bf6c6 100755 --- a/t/t4202-log.sh +++ b/t/t4202-log.sh @@ -72,9 +72,9 @@ cat > expect << EOF commit. EOF -test_expect_success 'format %w(12,1,2)' ' +test_expect_success 'format %w(11,1,2)' ' - git log -2 --format="%w(12,1,2)This is the %s commit." > actual && + git log -2 --format="%w(11,1,2)This is the %s commit." > actual && test_cmp expect actual ' |