From: Alexey Shumkin Date: Fri, 05 Jul 2013 07:46:44 GMT Subject: Re: [PATCH v9 4/5] t6006: add two more tests for the case i18n.commitEncoding is not set Message-ID: <20130705074644.GA32072@ashu.dyn1.rarus.ru> In-Reply-To: <7vk3l5a3nh.fsf@alter.siamese.dyndns.org> On Fri, Jul 05, 2013 at 12:04:34AM -0700, Junio C Hamano wrote: > Alexey Shumkin writes: > > > +test_format complex-body %b < > +commit $head3 > > +This commit message is much longer than the others, > > +and it will be encoded in iso8859-1. We should therefore > > +include an iso8859 character: ¡bueno! > > This is not such a good idea, as the resulting file will be in mixed > encoding (it already has a line with non-ascii that is in UTF-8), > and many editors would not like such a file. I agree, there was issues when I edited that file > > Perhaps we should update test_format so that we can feed a quoted > input, e.g. > > +include an iso8859-1 character: bueno! > > or something? We could use this file whole in UTF-8 but just make a conversion of expected output as it's done a few lines above with a commit message (stored to a file 'commit-msg' before the test 'setup complex body'). +iconv -f utf-8 -t iso8859-1 > commit-msg < > > +commit $head2 > > +commit $head1 > > +EOF > > + > > +# Git uses i18n.commitEncoding if no i18n.logOutputEncoding set > > +# so unset i18n.commitEncoding to test encoding conversion > > +git config --unset i18n.commitEncoding > > + > > +test_format complex-subject-commitencoding-unset %s < > +commit $head3 > > +Test printing of complex bodies > > +commit $head2 > > $changed > > commit $head1 > > $added > > EOF > > > > -test_format complex-body %b < > +test_format complex-body-commitencoding-unset %b < > commit $head3 > > This commit message is much longer than the others, > > and it will be encoded in iso8859-1. We should therefore -- Alexey Shumkin