Re: [PATCH 12/12] t3901: test git-am encoding conversion

From: Paul Tan <pyokagan@gmail.com>
Date: Jul 14, 2015, 09:43 UTC
Message-ID: <CACRoPnTZap1bn99kB37eJ3N61EprSa9oyXozRJ5qmN9JPTDVkw@mail.gmail.com>
In-Reply-To: <559D8BA0.5090701@kdbg.org>

On Thu, Jul 9, 2015 at 4:44 AM, Johannes Sixt <j6t@kdbg.org> wrote:

Show 34 quoted lines

> Am 02.07.2015 um 20:16 schrieb Paul Tan:
>> diff --git a/t/t3901-i18n-patch.sh b/t/t3901-i18n-patch.sh
>> index 75cf3ff..b49bdb7 100755
>> --- a/t/t3901-i18n-patch.sh
>> +++ b/t/t3901-i18n-patch.sh
>> @@ -251,4 +251,66 @@ test_expect_success 'rebase --merge (L/U)' '
>>         check_encoding 2 8859
>>   '
>>
>> +test_expect_success 'am (U/U)' '
>> +       # Apply UTF-8 patches with UTF-8 commitencoding
>> +       git config i18n.commitencoding UTF-8 &&
>> +       . "$TEST_DIRECTORY"/t3901-utf8.txt &&
>> +
>> +       git reset --hard master &&
>> +       git am out-u1 out-u2 &&
>> +
>> +       check_encoding 2
>> +'
>> +
>> +test_expect_success 'am (L/L)' '
>> +       # Apply ISO-8859-1 patches with ISO-8859-1 commitencoding
>> +       git config i18n.commitencoding ISO8859-1 &&
>> +       . "$TEST_DIRECTORY"/t3901-8859-1.txt &&
>> +
>> +       git reset --hard master &&
>> +       git am out-l1 out-l2 &&
>> +
>> +       check_encoding 2 8859
>> +'
>
>
> This test case must be protected by !MINGW, just like the last case below
> and other cases that are already in the file. See 32f4cb6cee for details.

Ah, OK.

Thanks, Paul