From: Junio C Hamano <gitster@pobox.com>
To: Elijah Newren <newren@gmail.com>
Cc: git@vger.kernel.org, gitster@pobox.com
Subject: Re: [PATCHv4 03/15] t100[12] (read-tree-m-2way, read_tree_m_u_2way): add missing &&
Date: Wed, 29 Sep 2010 11:28:22 -0700 [thread overview]
Message-ID: <7v8w2ko14p.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <1285542879-16381-4-git-send-email-newren@gmail.com> (Elijah Newren's message of "Sun\, 26 Sep 2010 17\:14\:27 -0600")
Elijah Newren <newren@gmail.com> writes:
> Also, replace "|| return 1" with "&&" in order to keep commands chained.
>
> Acked-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
> Signed-off-by: Elijah Newren <newren@gmail.com>
> ---
> 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 &&
Shouldn't this be must-fail, as we are expecting to see some differences?
> compare_change 4diff.out expected &&
> check_cache_at yomin clean'
>
> @@ -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 &&
Ditto.
> compare_change 5diff.out expected &&
> check_cache_at yomin dirty'
>
> @@ -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 &&
Ditto.
> compare_change 14diff.out expected &&
> check_cache_at nitfol clean'
>
> @@ -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 &&
Ditto.
> compare_change 15diff.out expected &&
> check_cache_at nitfol dirty'
>
> @@ -377,7 +377,7 @@ test_expect_success \
> git ls-files --stage >treeM.out &&
>
> rm -f a &&
> - mkdir a
> + mkdir a &&
> : >a/b &&
> git update-index --add --remove a a/b &&
> treeH=`git write-tree` &&
> diff --git a/t/t1002-read-tree-m-u-2way.sh b/t/t1002-read-tree-m-u-2way.sh
> 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 &&
Ditto.
> 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 &&
Ditto.
> 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=`git write-tree` &&
> --
> 1.7.3.95.g14291
next prev parent reply other threads:[~2010-09-29 18:28 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-26 23:14 [PATCHv4 00/15] Add missing &&'s in the testsuite Elijah Newren
2010-09-26 23:14 ` [PATCHv4 01/15] t3020 (ls-files-error-unmatch): remove stray '1' from end of file Elijah Newren
2010-09-26 23:14 ` [PATCHv4 02/15] t4017 (diff-retval): replace manual exit code check with test_expect_code Elijah Newren
2010-09-29 18:07 ` Junio C Hamano
2010-09-29 18:45 ` Ævar Arnfjörð Bjarmason
2010-10-01 10:23 ` Jonathan Nieder
2010-10-01 10:38 ` Ævar Arnfjörð Bjarmason
2010-10-01 11:52 ` Jonathan Nieder
2010-10-01 16:20 ` Junio C Hamano
2010-10-01 17:16 ` [PATCH] test-lib: make test_expect_code a test command Ævar Arnfjörð Bjarmason
2010-10-01 17:39 ` Sverre Rabbelier
2010-10-01 17:46 ` Ævar Arnfjörð Bjarmason
2010-10-01 17:47 ` Sverre Rabbelier
2010-10-01 17:42 ` [PATCH v2] " Ævar Arnfjörð Bjarmason
2010-10-01 18:55 ` [PATCH] " Jonathan Nieder
2010-09-26 23:14 ` [PATCHv4 03/15] t100[12] (read-tree-m-2way, read_tree_m_u_2way): add missing && Elijah Newren
2010-09-29 18:28 ` Junio C Hamano [this message]
2010-10-01 10:27 ` Jonathan Nieder
2010-09-26 23:14 ` [PATCHv4 04/15] t4002 (diff-basic): use test_might_fail for commands that might fail Elijah Newren
2010-10-01 10:35 ` Jonathan Nieder
2010-09-26 23:14 ` [PATCHv4 05/15] t4202 (log): Replace '<git-command> || :' with test_might_fail Elijah Newren
2010-09-26 23:14 ` [PATCHv4 06/15] t3600 (rm): add lots of missing && Elijah Newren
2010-10-01 10:48 ` Jonathan Nieder
2010-10-03 2:47 ` Elijah Newren
2010-09-26 23:14 ` [PATCHv4 07/15] t4019 (diff-wserror): " Elijah Newren
2010-09-29 19:01 ` Junio C Hamano
2010-10-03 3:03 ` Elijah Newren
2010-10-01 11:00 ` Jonathan Nieder
2010-09-26 23:14 ` [PATCHv4 08/15] t4026 (color): remove unneeded and unchained command Elijah Newren
2010-09-26 23:14 ` [PATCHv4 09/15] t5602 (clone-remote-exec): add missing && Elijah Newren
2010-09-29 19:09 ` Junio C Hamano
2010-10-01 11:34 ` Jonathan Nieder
2010-10-03 3:08 ` Elijah Newren
2010-09-26 23:14 ` [PATCHv4 10/15] t6016 (rev-list-graph-simplify-history): " Elijah Newren
2010-09-27 0:10 ` Jonathan Nieder
2010-09-26 23:14 ` [PATCHv4 11/15] t7001 (mv): " Elijah Newren
2010-09-26 23:14 ` [PATCHv4 12/15] t7601 (merge-pull-config): " Elijah Newren
2010-09-26 23:14 ` [PATCHv4 13/15] t7800 (difftool): " Elijah Newren
2010-10-01 11:30 ` Jonathan Nieder
2010-09-26 23:14 ` [PATCHv4 14/15] Add missing &&'s throughout the testsuite Elijah Newren
2010-09-29 19:37 ` Junio C Hamano
2010-10-01 0:48 ` Ævar Arnfjörð Bjarmason
2010-10-01 11:26 ` Jonathan Nieder
2010-09-26 23:14 ` [PATCHv4 15/15] Replace "unset VAR" with "unset VAR;" in testsuite as per t/README Elijah Newren
2010-09-29 19:48 ` Junio C Hamano
2010-09-29 20:28 ` Ævar Arnfjörð Bjarmason
2010-09-29 20:30 ` Elijah Newren
2010-09-30 16:09 ` Junio C Hamano
2010-09-30 21:51 ` Elijah Newren
2010-10-01 11:45 ` Jonathan Nieder
2010-10-01 14:39 ` Sverre Rabbelier
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=7v8w2ko14p.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=newren@gmail.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).