From: Junio C Hamano Date: Sat, 14 May 2016 17:37:07 GMT Subject: Re: [PATCH 3/6] t9107: use "return 1" instead of "exit 1" Message-ID: In-Reply-To: <20160513234704.GA20238@sigill.intra.peff.net> Jeff King 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 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