Re: 2.11.0-rc1 will not be tagged for a few days
Show 33 quoted lines
> On 11 Nov 2016, at 18:31, Lars Schneider <larsxschneider@gmail.com> wrote:
>
>>
>> On 11 Nov 2016, at 18:05, Lars Schneider <larsxschneider@gmail.com> wrote:
>>
>>
>>> On 11 Nov 2016, at 17:13, Johannes Schindelin <johannes.schindelin@gmx.de> wrote:
>>>
>>> Hi Junio,
>>>
>>> On Thu, 10 Nov 2016, Junio C Hamano wrote:
>>>
>>>> Junio C Hamano <gitster@pobox.com> writes:
>>>>
>>>>> I'll report back an updated schedule when able.
>>>>
>>>> I pushed some updates out on 'master' today.
>>>
>>> Which means that t0021 is now broken also on `master` when running in Git
>>> for Windows' SDK.
>>
>> Part of the reason is that Hannes' squash got lost:
>> http://public-inbox.org/git/d36d8b51-f2d7-a2f5-89ea-369f49556e10@kdbg.org/
>>
>> @Junio: Can you apply this (see discussion with Peff linked to email above).
>>
>> @Dscho:
>> There is still one remaining new issue with t0021 ... investigating!
>
> "17 - required process filter should be used only for "clean" operation only"
> seems flaky.
>
> I don't have any more time today but I will look into it tomorrow.
FWIW: This patch (which would be the right thing to do anyways) seems to fix
the flakyness but I can't be sure ... it needs to run longer...
diff --git a/t/t0021-conversion.sh b/t/t0021-conversion.sh
index 9ff5027..107766b 100755
--- a/t/t0021-conversion.sh
+++ b/t/t0021-conversion.sh
@@ -29,8 +29,7 @@ file_size () {
filter_git () {
rm -f rot13-filter.log &&
- git "$@" 2>git-stderr.log &&
- rm -f git-stderr.log
+ git "$@" 2>/dev/null
}
# Compare two files and ensure that `clean` and `smudge` respectively are
Lars Schneider <larsxschneider@gmail.com>