From: Lars Schneider <larsxschneider@gmail.com>
To: Johannes Sixt <j6t@kdbg.org>
Cc: Junio C Hamano <gitster@pobox.com>,
Johannes Schindelin <johannes.schindelin@gmx.de>,
git@vger.kernel.org
Subject: Re: 2.11.0-rc1 will not be tagged for a few days
Date: Sat, 12 Nov 2016 14:33:29 +0100 [thread overview]
Message-ID: <D8EBCC92-6570-4120-85A8-A9A9CAC74286@gmail.com> (raw)
In-Reply-To: <a90fe336-5b62-4278-64e6-e73cb65a02a8@kdbg.org>
> On 11 Nov 2016, at 22:22, Johannes Sixt <j6t@kdbg.org> wrote:
>
> Am 11.11.2016 um 22:07 schrieb Junio C Hamano:
>> Junio C Hamano <gitster@pobox.com> 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@pobox.com>
>
> 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
>>
>
next prev parent reply other threads:[~2016-11-12 13:33 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-07 2:32 2.11.0-rc1 will not be tagged for a few days Junio C Hamano
2016-11-08 0:40 ` Jeff King
2016-11-08 6:25 ` Johannes Sixt
2016-11-08 21:48 ` Jeff King
2016-11-09 6:29 ` Junio C Hamano
2016-11-09 16:51 ` Jeff King
2016-11-09 23:35 ` Junio C Hamano
2016-11-09 23:40 ` Junio C Hamano
2016-11-10 21:43 ` Junio C Hamano
2016-11-11 0:26 ` Junio C Hamano
2016-11-11 16:13 ` Johannes Schindelin
2016-11-11 17:02 ` Johannes Schindelin
2016-11-11 17:05 ` Lars Schneider
2016-11-11 17:31 ` Lars Schneider
2016-11-11 17:38 ` Lars Schneider
2016-11-11 20:44 ` Johannes Sixt
2016-11-11 20:52 ` Junio C Hamano
2016-11-11 21:07 ` Junio C Hamano
2016-11-11 21:22 ` Johannes Sixt
2016-11-12 13:33 ` Lars Schneider [this message]
2016-11-11 17:41 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=D8EBCC92-6570-4120-85A8-A9A9CAC74286@gmail.com \
--to=larsxschneider@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
--cc=johannes.schindelin@gmx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).