All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Johannes Sixt <j6t@kdbg.org>
Cc: Lars Schneider <larsxschneider@gmail.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: Fri, 11 Nov 2016 13:07:37 -0800	[thread overview]
Message-ID: <xmqqr36h209y.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <xmqq1syh3fjx.fsf@gitster.mtv.corp.google.com> (Junio C. Hamano's message of "Fri, 11 Nov 2016 12:52:18 -0800")

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>
---
 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

  reply	other threads:[~2016-11-11 21:07 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 [this message]
2016-11-11 21:22                 ` Johannes Sixt
2016-11-12 13:33                   ` Lars Schneider
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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqr36h209y.fsf@gitster.mtv.corp.google.com \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=j6t@kdbg.org \
    --cc=johannes.schindelin@gmx.de \
    --cc=larsxschneider@gmail.com \
    /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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.