From mboxrd@z Thu Jan 1 00:00:00 1970 From: Elijah Newren Subject: [PATCHv4 03/15] t100[12] (read-tree-m-2way, read_tree_m_u_2way): add missing && Date: Sun, 26 Sep 2010 17:14:27 -0600 Message-ID: <1285542879-16381-4-git-send-email-newren@gmail.com> References: <1285542879-16381-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, Elijah Newren To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Mon Sep 27 01:13:24 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 1P00PK-0005V8-0Z for gcvg-git-2@lo.gmane.org; Mon, 27 Sep 2010 01:13:22 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758228Ab0IZXNK convert rfc822-to-quoted-printable (ORCPT ); Sun, 26 Sep 2010 19:13:10 -0400 Received: from mail-pv0-f174.google.com ([74.125.83.174]:37370 "EHLO mail-pv0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757639Ab0IZXNI (ORCPT ); Sun, 26 Sep 2010 19:13:08 -0400 Received: by mail-pv0-f174.google.com with SMTP id 2so1087690pvg.19 for ; Sun, 26 Sep 2010 16:13:08 -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=aq+JPVeNer3btBM8e8x3k8YKQye79TfIg6X/D4QAylY=; b=Bf0gozlnnHHmU5351LsRw5B1NOb7glBtinbKWzNTx5RHu1P5fnJOPqVNDlYQ5rchFo E80oovBeP4uo6cosk8fIZT7hkGK2TwHcYfj70rDgdzNKsXmbmV77Q1XhDypBaASor496 bY8AgkFEozCt8jWk6eXpCfmiDrvtoB3tfwmco= 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=vZ4uqcOYX6z9QZEyJQKbJhIiOWCUSZJbvwDLEsDmO+eCHTkT98Mdya+1wFo9h8UabP c7ygJT7iaEg4JwY1dDAyjzs1RODjQMqnsabk8U+X5HwCmM/0BsC34RAy5rV0oZlPI3nG FaE697VkjIXxdTsvSY3TE2fI84BAlNpnwmtfM= Received: by 10.114.112.15 with SMTP id k15mr7323840wac.183.1285542788340; Sun, 26 Sep 2010 16:13:08 -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 c24sm9242157wam.19.2010.09.26.16.13.06 (version=SSLv3 cipher=RC4-MD5); Sun, 26 Sep 2010 16:13:07 -0700 (PDT) X-Mailer: git-send-email 1.7.3.95.g14291 In-Reply-To: <1285542879-16381-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..ce8112c 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_might_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_might_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_might_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_might_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..a9492e9 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_might_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_might_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.95.g14291