From: Eric Sunshine Date: Tue, 26 Jun 2018 07:29:43 GMT Subject: [PATCH 11/29] t9104: use "{...}" block around "||" expression rather than subshell Message-ID: <20180626073001.6555-12-sunshine@sunshineco.com> In-Reply-To: <20180626073001.6555-1-sunshine@sunshineco.com> This test uses "(... || svn ...)" as a shorthand for an if-then-else statement. The subshell prevents it from breaking the top-level &&-chain. However, an upcoming change will teach --chain-lint to check the &&-chain inside subshells. Although it takes special care to allow "||" inside subshells, it only recognizes "(... || git ...)" and "(... || test*), so the "||" in this test will trip up --chain-lint. A test later in this same script employs the same "... || svn ..." construct, however, it wraps it in a "{...}" block instead of a subshell. Therefore, rather than adding "(... || svn ...)" as a yet another --chain-lint special case, follow suit and make this test use "{...}", as well. Signed-off-by: Eric Sunshine --- t/t9104-git-svn-follow-parent.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/t/t9104-git-svn-follow-parent.sh b/t/t9104-git-svn-follow-parent.sh index 5e0ad19177..f9aa734d4e 100755 --- a/t/t9104-git-svn-follow-parent.sh +++ b/t/t9104-git-svn-follow-parent.sh @@ -53,10 +53,10 @@ test_expect_success 'init and fetch from one svn-remote' ' ' test_expect_success 'follow deleted parent' ' - (svn_cmd cp -m "resurrecting trunk as junk" \ + { svn_cmd cp -m "resurrecting trunk as junk" \ "$svnrepo"/trunk@2 "$svnrepo"/junk || svn cp -m "resurrecting trunk as junk" \ - -r2 "$svnrepo"/trunk "$svnrepo"/junk) && + -r2 "$svnrepo"/trunk "$svnrepo"/junk; } && git config --add svn-remote.svn.fetch \ junk:refs/remotes/svn/junk && git svn fetch -i svn/thunk && -- 2.18.0.419.gfe4b301394