Re: 2.11.0-rc1 will not be tagged for a few days

From: Johannes Sixt <j6t@kdbg.org>
Date: Nov 11, 2016, 20:44 UTC
Message-ID: <e0785e35-b43d-37ed-598d-b458daf3c355@kdbg.org>
In-Reply-To: <C3840B91-58E2-4563-9597-5EE514D97CC1@gmail.com>

Am 11.11.2016 um 18:38 schrieb Lars Schneider:

Show 9 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:
>>> @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.

Good to know that I am not alone. This one fails consistently for me. I dug into it a bit today, but it drives me mad. Process Monitor reports that the redirected-to file (git-stderr.log) gets marked as "Delete pending" by git.exe, but I have absolutely no clue where this is coming from. Git.exe has no business fuzzing with the file; it just has to write() something into it, if at all. When 'git checkout' ends, the file is closed, and removed due to the "Delete pending" mark. At the same time, git.exe finishes with non-zero exit code. For whatever reason.

Show 14 quoted lines

> 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

If I remove the redirection altogether, the test passes for me consistently. The redirection isn't necessary anyway, it looks like a debugging left-over.

Show 5 quoted lines

>  }
>
>  # Compare two files and ensure that `clean` and `smudge` respectively are
>
>

-- Hannes