git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Elijah Newren <newren@gmail.com>
To: git@vger.kernel.org
Cc: Elijah Newren <newren@gmail.com>,
	Christian Couder <chriscool@tuxfamily.org>
Subject: [PATCHv3 11/16] t6050 (replace): add missing &&
Date: Sat, 25 Sep 2010 13:07:02 -0600	[thread overview]
Message-ID: <1285441627-28233-12-git-send-email-newren@gmail.com> (raw)
In-Reply-To: <1285441627-28233-1-git-send-email-newren@gmail.com>

Also, mark the first grep in the 'fetch branch with replacement' test as
being expected to fail.

CC: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Elijah Newren <newren@gmail.com>
---
The modified test below was first introduced in 4e65b53 (t6050: check
pushing something based on a replaced commit 2009-05-27), with the
lack of chaining.  It is not clear reading the original or current
version of the test (before my change) whether the grep is meant to
fail, and thus whether my change is correct.  Hopefully Christian can
answer.

 t/t6050-replace.sh |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh
index c907523..11a0680 100755
--- a/t/t6050-replace.sh
+++ b/t/t6050-replace.sh
@@ -205,8 +205,9 @@ 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 >output &&
+	  ! grep $PARA3 output &&
 	  git show $PARA3 | grep "A U Thor"
      )
 '
-- 
1.7.3.95.g14291

  parent reply	other threads:[~2010-09-25 19:06 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-09-25 19:06 [PATCHv3 00/16] Add missing &&'s in the testsuite Elijah Newren
2010-09-25 19:06 ` [PATCHv3 01/16] t3020 (ls-files-error-unmatch): remove stray '1' from end of file Elijah Newren
2010-09-25 19:06 ` [PATCHv3 02/16] t4017 (diff-retval): replace manual exit code check with test_expect_code Elijah Newren
2010-09-25 19:06 ` [PATCHv3 03/16] t100[12] (read-tree-m-2way, read_tree_m_u_2way): add missing && Elijah Newren
2010-09-25 19:06 ` [PATCHv3 04/16] t4002 (diff-basic): use test_might_fail for commands that might fail Elijah Newren
2010-09-25 19:06 ` [PATCHv3 05/16] t4202 (log): Replace '<git-command> || :' with test_might_fail Elijah Newren
2010-09-25 19:06 ` [PATCHv3 06/16] t3600 (rm): add lots of missing && Elijah Newren
2010-09-25 19:06 ` [PATCHv3 07/16] t4019 (diff-wserror): " Elijah Newren
2010-09-25 19:06 ` [PATCHv3 08/16] t4026 (color): add " Elijah Newren
2010-09-26  3:38   ` Jeff King
2010-09-26 12:39     ` Elijah Newren
2010-09-25 19:07 ` [PATCHv3 09/16] t5602 (clone-remote-exec): " Elijah Newren
2010-09-25 19:07 ` [PATCHv3 10/16] t6016 (rev-list-graph-simplify-history): " Elijah Newren
2010-09-25 19:07 ` Elijah Newren [this message]
2010-09-26  5:22   ` [PATCHv3 11/16] t6050 (replace): " Christian Couder
2010-09-25 19:07 ` [PATCHv3 12/16] t7001 (mv): " Elijah Newren
2010-09-25 19:07 ` [PATCHv3 13/16] t7601 (merge-pull-config): " Elijah Newren
2010-09-25 19:07 ` [PATCHv3 14/16] t7800 (difftool): " Elijah Newren
2010-09-25 19:07 ` [PATCHv3 15/16] Add missing &&'s throughout the testsuite Elijah Newren
2010-09-25 19:38   ` Ævar Arnfjörð Bjarmason
2010-09-25 19:48     ` Elijah Newren
2010-09-25 19:07 ` [PATCHv3 16/16] Replace "unset VAR" with "unset VAR;" in testsuite as per t/README Elijah Newren
2010-09-25 19:39 ` [PATCHv3 00/16] Add missing &&'s in the testsuite Ævar Arnfjörð Bjarmason
2010-09-25 21:07   ` Elijah Newren

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=1285441627-28233-12-git-send-email-newren@gmail.com \
    --to=newren@gmail.com \
    --cc=chriscool@tuxfamily.org \
    --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.
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).