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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



> On 11 Nov 2016, at 22:22, Johannes Sixt <j6t@xxxxxxxx> wrote:
> 
> Am 11.11.2016 um 22:07 schrieb Junio C Hamano:
>> Junio C Hamano <gitster@xxxxxxxxx> writes:
>> 
>>> OK, then let's have
>>> 
>>> 	filter_git () {
>>> 		rm -f rot13-filter.log &&
>>> 		git "$@"
>>>                ...
>>> 
>>> and call that -rc1.
>> 
>> That is, to queue this on top of ls/filter-process and merge it
>> down.
>> 
>> -- >8 --
>> Subject: t0021: remove debugging cruft
>> 
>> The redirection of the standard error stream to a temporary file is
>> a leftover cruft during debugging.  Remove it.
>> 
>> Besides, it is reported by folks on the Windows that the test is
>> flaky with this redirection; somebody gets confused and this
>> merely-redirected-to file gets marked as delete-pending by git.exe
>> and makes it finish with a non-zero exit status when "git checkout"
>> finishes.  Windows folks may want to figure that one out, but for
>> the purpose of this test, it shouldn't become a show-stopper.
>> 
>> Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx>
> 
> Nicely summarized! Thank you very much!
> 
> I've double-checked again that the redirection is really not used by the tests. The name does occur in a .gitignore, but I guess that is not important for the background filter process. It would be good if Lars could confirm this.

Yesterday, I wasn't sure if silencing stderr was required by the test.
Junio's assessment and solution is spot on.

Thanks a lot,
Lars


> 
>> ---
>> t/t0021-conversion.sh | 3 +--
>> 1 file changed, 1 insertion(+), 2 deletions(-)
>> 
>> diff --git a/t/t0021-conversion.sh b/t/t0021-conversion.sh
>> index cb72fa49de..5ce2535017 100755
>> --- a/t/t0021-conversion.sh
>> +++ b/t/t0021-conversion.sh
>> @@ -27,8 +27,7 @@ file_size () {
>> 
>> filter_git () {
>> 	rm -f rot13-filter.log &&
>> -	git "$@" 2>git-stderr.log &&
>> -	rm -f git-stderr.log
>> +	git "$@"
>> }
>> 
>> # Compare two files and ensure that `clean` and `smudge` respectively are
>> 
> 





[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]