All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: Eric Sunshine <sunshine@sunshineco.com>,
	Armin Kunaschik <megabreit@googlemail.com>,
	Git List <git@vger.kernel.org>
Subject: Re: [PATCH 3/6] t9107: use "return 1" instead of "exit 1"
Date: Sat, 14 May 2016 10:37:07 -0700	[thread overview]
Message-ID: <xmqqbn488rss.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20160513234704.GA20238@sigill.intra.peff.net> (Jeff King's message of "Fri, 13 May 2016 19:47:04 -0400")

Jeff King <peff@peff.net> writes:

> On Fri, May 13, 2016 at 07:45:42PM -0400, Eric Sunshine wrote:
>
>> > +       >expect &&
>> 
>> What's this 'expect' file for? Is it leftover gunk from before you
>> settled on 'diff --exit-code'?
>
> Oops, yes, that's exactly it.
>
> -Peff

Thanks for sharp eyes.  Let's squash this in, perhaps?

 t/t9107-git-svn-migrate.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/t/t9107-git-svn-migrate.sh b/t/t9107-git-svn-migrate.sh
index 2908aef..b6a99b8 100755
--- a/t/t9107-git-svn-migrate.sh
+++ b/t/t9107-git-svn-migrate.sh
@@ -80,12 +80,12 @@ test_expect_success 'multi-fetch works on partial urls + paths' '
 		git rev-parse --verify refs/remotes/origin/$i^0 || return 1;
 	done >refs.out &&
 	test -z "$(sort <refs.out | uniq -d)" &&
-	>expect &&
 	for i in $refs
 	do
 		for j in $refs
 		do
-			git diff --exit-code refs/remotes/origin/$i refs/remotes/origin/$j ||
+			git diff --exit-code refs/remotes/origin/$i \
+					     refs/remotes/origin/$j ||
 				return 1
 		done
 	done

  reply	other threads:[~2016-05-14 17:37 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-05-13 16:09 t3404 static check of bad SHA-1 failure Armin Kunaschik
2016-05-13 18:23 ` Jeff King
2016-05-13 19:52   ` Junio C Hamano
2016-05-13 19:59     ` Jeff King
2016-05-13 20:02       ` Jeff King
2016-05-13 20:03       ` Junio C Hamano
2016-05-13 20:46         ` [PATCH 0/6] test -z/-n quoting fix + misc cleanups Jeff King
2016-05-13 20:47           ` [PATCH 1/6] t/lib-git-svn: drop $remote_git_svn and $git_svn_id Jeff King
2016-05-13 20:47           ` [PATCH 2/6] t9100,t3419: enclose all test code in single-quotes Jeff King
2016-05-13 20:47           ` [PATCH 3/6] t9107: use "return 1" instead of "exit 1" Jeff King
2016-05-13 22:59             ` Eric Wong
2016-05-13 23:45             ` Eric Sunshine
2016-05-13 23:47               ` Jeff King
2016-05-14 17:37                 ` Junio C Hamano [this message]
2016-05-14 19:51                   ` Jeff King
2016-05-13 20:47           ` [PATCH 4/6] t9107: switch inverted single/double quotes in test Jeff King
2016-05-13 20:47           ` [PATCH 5/6] t9103: modernize test style Jeff King
2016-05-13 20:47           ` [PATCH 6/6] always quote shell arguments to test -z/-n Jeff King
2016-05-13 22:09           ` [PATCH 0/6] test -z/-n quoting fix + misc cleanups 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=xmqqbn488rss.fsf@gitster.mtv.corp.google.com \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=megabreit@googlemail.com \
    --cc=peff@peff.net \
    --cc=sunshine@sunshineco.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.