git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Elijah Newren <newren@gmail.com>
To: git@vger.kernel.org
Cc: Elijah Newren <newren@gmail.com>
Subject: [RFC PATCHv2 12/16] t6050 (replace): add missing &&
Date: Fri, 24 Sep 2010 16:22:52 -0600	[thread overview]
Message-ID: <1285366976-22216-13-git-send-email-newren@gmail.com> (raw)
In-Reply-To: <1285366976-22216-1-git-send-email-newren@gmail.com>

FIXME: Is the grep really meant to fail?

Signed-off-by: Elijah Newren <newren@gmail.com>
---
 t/t6050-replace.sh |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh
index c907523..b0d47bc 100755
--- a/t/t6050-replace.sh
+++ b/t/t6050-replace.sh
@@ -205,8 +205,8 @@ test_expect_success 'fetch branch with replacement' '
      git branch tofetch $HASH6 &&
      (
 	  cd clone_dir &&
-	  git fetch origin refs/heads/tofetch:refs/heads/parallel3
-	  git log --pretty=oneline parallel3 | grep $PARA3
+	  git fetch origin refs/heads/tofetch:refs/heads/parallel3 &&
+	  git log --pretty=oneline parallel3 | test_must_fail grep $PARA3 &&
 	  git show $PARA3 | grep "A U Thor"
      )
 '
-- 
1.7.3.95.g14291

  parent reply	other threads:[~2010-09-24 22:22 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-09-24 22:22 [RFC PATCHv2 00/16] Add missing &&'s in the testsuite Elijah Newren
2010-09-24 22:22 ` [RFC PATCHv2 01/16] t3020 (ls-files-error-unmatch): remove stray '1' from end of file Elijah Newren
2010-09-24 22:22 ` [RFC PATCHv2 02/16] t4017 (diff-retval): replace manual exit code check with test_expect_code Elijah Newren
2010-09-24 22:49   ` Ævar Arnfjörð Bjarmason
2010-09-24 22:22 ` [RFC PATCHv2 03/16] t1001 (read-tree-m-2way): add missing && Elijah Newren
2010-09-24 22:50   ` Ævar Arnfjörð Bjarmason
2010-09-24 22:22 ` [RFC PATCHv2 04/16] t1002 (read-tree-m-u-2way): " Elijah Newren
2010-09-24 22:22 ` [RFC PATCHv2 05/16] t4002 (diff-basic): use test_might_fail for commands that might fail Elijah Newren
2010-09-24 22:52   ` Ævar Arnfjörð Bjarmason
2010-09-24 22:22 ` [RFC PATCHv2 06/16] t4202 (log): Replace '<git-command> || :' with test_might_fail Elijah Newren
2010-09-24 22:22 ` [RFC PATCHv2 07/16] t3600 (rm): add lots of missing && Elijah Newren
2010-09-24 22:58   ` Ævar Arnfjörð Bjarmason
2010-09-24 22:22 ` [RFC PATCHv2 08/16] t4019 (diff-wserror): " Elijah Newren
2010-09-24 22:22 ` [RFC PATCHv2 09/16] t4026 (color): add " Elijah Newren
2010-09-24 22:55   ` Ævar Arnfjörð Bjarmason
2010-09-25  4:02     ` Jeff King
2010-09-25  7:56       ` Jakub Narebski
2010-09-24 22:22 ` [RFC PATCHv2 10/16] t5602 (clone-remote-exec): " Elijah Newren
2010-09-24 22:22 ` [RFC PATCHv2 11/16] t6016 (rev-list-graph-simplify-history): " Elijah Newren
2010-09-24 23:00   ` Ævar Arnfjörð Bjarmason
2010-09-24 22:22 ` Elijah Newren [this message]
2010-09-24 23:04   ` [RFC PATCHv2 12/16] t6050 (replace): " Ævar Arnfjörð Bjarmason
2010-09-24 22:22 ` [RFC PATCHv2 13/16] t7001 (mv): " Elijah Newren
2010-09-24 23:00   ` Ævar Arnfjörð Bjarmason
2010-09-24 22:22 ` [RFC PATCHv2 14/16] t7601 (merge-pull-config): " Elijah Newren
2010-09-24 22:22 ` [RFC PATCHv2 15/16] t7800 (difftool): " Elijah Newren
2010-09-24 23:02   ` Ævar Arnfjörð Bjarmason
2010-09-24 22:22 ` [RFC PATCHv2 16/16] Add missing &&'s throughout the testsuite Elijah Newren
2010-09-24 23:18   ` Ævar Arnfjörð Bjarmason
2010-09-25 16:50     ` Elijah Newren
2010-09-25 17:05       ` Ævar Arnfjörð Bjarmason

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

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1285366976-22216-13-git-send-email-newren@gmail.com \
    --to=newren@gmail.com \
    --cc=git@vger.kernel.org \
    /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.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).