From mboxrd@z Thu Jan 1 00:00:00 1970 From: Elijah Newren Subject: [PATCHv5 04/16] t100[12] (read-tree-m-2way, read_tree_m_u_2way): add missing && Date: Sat, 2 Oct 2010 23:10:32 -0600 Message-ID: <1286082644-31595-5-git-send-email-newren@gmail.com> References: <1286082644-31595-1-git-send-email-newren@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: gitster@pobox.com, avarab@gmail.com, jrnieder@gmail.com, Elijah Newren To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Sun Oct 03 07:10:07 2010 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1P2Gpp-0001zH-82 for gcvg-git-2@lo.gmane.org; Sun, 03 Oct 2010 07:10:05 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751991Ab0JCFJY convert rfc822-to-quoted-printable (ORCPT ); Sun, 3 Oct 2010 01:09:24 -0400 Received: from mail-pv0-f174.google.com ([74.125.83.174]:55800 "EHLO mail-pv0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751886Ab0JCFJW (ORCPT ); Sun, 3 Oct 2010 01:09:22 -0400 Received: by mail-pv0-f174.google.com with SMTP id 2so1068412pvg.19 for ; Sat, 02 Oct 2010 22:09:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references:mime-version :content-type:content-transfer-encoding; bh=fO36YZgxp1yX35m2BE1Dn2os5BUA5e8ndTxU7AFbA0U=; b=J6loMJ9Zc8GPra0guTpduRheWgoFS0IXCmbRnKokXTdzX9V66pj4+7mv6tE91AyeuA aCTw5KSP1kSfbppKXK5bTRmvhsDm50ZvBzvlRUh/FKU2g5MyvqAq5TOS0lYIoE4h7Rhr wXh5Hr1oGgoZbsy7GAQgufqe+/kqR+xMqZwXA= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :mime-version:content-type:content-transfer-encoding; b=JIKRGu6f55fERieh1xo8Ei62hmR69T4XW5YJhcxIhwjjEG/VH/dMF5M22P3+tLdKzy y0vheNbBy2EF1y+EGXxJvQvnKafPIacr9J7hTjfpUxW8xwVgGed6JzbdXa3keeL1lL1v QISvakIBzL0oNY9gurNj+K6lduc9qVQASlJEs= Received: by 10.142.223.2 with SMTP id v2mr6818157wfg.340.1286082562416; Sat, 02 Oct 2010 22:09:22 -0700 (PDT) Received: from Miney.hsd1.nm.comcast.net. (c-76-113-57-218.hsd1.nm.comcast.net [76.113.57.218]) by mx.google.com with ESMTPS id o16sm4140250wfh.19.2010.10.02.22.09.20 (version=SSLv3 cipher=RC4-MD5); Sat, 02 Oct 2010 22:09:21 -0700 (PDT) X-Mailer: git-send-email 1.7.3.1.66.gab790 In-Reply-To: <1286082644-31595-1-git-send-email-newren@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Also, replace "|| return 1" with "&&" in order to keep commands chained= =2E Acked-by: =C3=86var Arnfj=C3=B6r=C3=B0 Bjarmason Signed-off-by: Elijah Newren --- t/t1001-read-tree-m-2way.sh | 18 +++++++++--------- t/t1002-read-tree-m-u-2way.sh | 10 +++++----- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/t/t1001-read-tree-m-2way.sh b/t/t1001-read-tree-m-2way.sh index 93ca84f..c28d790 100755 --- a/t/t1001-read-tree-m-2way.sh +++ b/t/t1001-read-tree-m-2way.sh @@ -98,8 +98,8 @@ test_expect_success \ git checkout-index -u -f -q -a && git update-index --add yomin && read_tree_twoway $treeH $treeM && - git ls-files --stage >4.out || return 1 - git diff --no-index M.out 4.out >4diff.out + git ls-files --stage >4.out && + test_must_fail git diff --no-index M.out 4.out >4diff.out && compare_change 4diff.out expected && check_cache_at yomin clean' =20 @@ -112,8 +112,8 @@ test_expect_success \ git update-index --add yomin && echo yomin yomin >yomin && read_tree_twoway $treeH $treeM && - git ls-files --stage >5.out || return 1 - git diff --no-index M.out 5.out >5diff.out + git ls-files --stage >5.out && + test_must_fail git diff --no-index M.out 5.out >5diff.out && compare_change 5diff.out expected && check_cache_at yomin dirty' =20 @@ -213,8 +213,8 @@ test_expect_success \ echo nitfol nitfol >nitfol && git update-index --add nitfol && read_tree_twoway $treeH $treeM && - git ls-files --stage >14.out || return 1 - git diff --no-index M.out 14.out >14diff.out + git ls-files --stage >14.out && + test_must_fail git diff --no-index M.out 14.out >14diff.out && compare_change 14diff.out expected && check_cache_at nitfol clean' =20 @@ -227,8 +227,8 @@ test_expect_success \ git update-index --add nitfol && echo nitfol nitfol nitfol >nitfol && read_tree_twoway $treeH $treeM && - git ls-files --stage >15.out || return 1 - git diff --no-index M.out 15.out >15diff.out + git ls-files --stage >15.out && + test_must_fail git diff --no-index M.out 15.out >15diff.out && compare_change 15diff.out expected && check_cache_at nitfol dirty' =20 @@ -377,7 +377,7 @@ test_expect_success \ git ls-files --stage >treeM.out && =20 rm -f a && - mkdir a + mkdir a && : >a/b && git update-index --add --remove a a/b && treeH=3D`git write-tree` && diff --git a/t/t1002-read-tree-m-u-2way.sh b/t/t1002-read-tree-m-u-2way= =2Esh index 0241329..a4a17e0 100755 --- a/t/t1002-read-tree-m-u-2way.sh +++ b/t/t1002-read-tree-m-u-2way.sh @@ -205,8 +205,8 @@ test_expect_success \ echo nitfol nitfol >nitfol && git update-index --add nitfol && git read-tree -m -u $treeH $treeM && - git ls-files --stage >14.out || return 1 - git diff -U0 --no-index M.out 14.out >14diff.out + git ls-files --stage >14.out && + test_must_fail git diff -U0 --no-index M.out 14.out >14diff.out &= & compare_change 14diff.out expected && sum bozbar frotz >actual14.sum && grep -v nitfol M.sum > expected14.sum && @@ -226,8 +226,8 @@ test_expect_success \ git update-index --add nitfol && echo nitfol nitfol nitfol >nitfol && git read-tree -m -u $treeH $treeM && - git ls-files --stage >15.out || return 1 - git diff -U0 --no-index M.out 15.out >15diff.out + git ls-files --stage >15.out && + test_must_fail git diff -U0 --no-index M.out 15.out >15diff.out &= & compare_change 15diff.out expected && check_cache_at nitfol dirty && sum bozbar frotz >actual15.sum && @@ -314,7 +314,7 @@ test_expect_success \ # Also make sure we did not break DF vs DF/DF case. test_expect_success \ 'DF vs DF/DF case setup.' \ - 'rm -f .git/index + 'rm -f .git/index && echo DF >DF && git update-index --add DF && treeDF=3D`git write-tree` && --=20 1.7.3.1.66.gab790