From: Elijah Newren Date: Sat, 25 Sep 2010 19:07:02 GMT Subject: [PATCHv3 11/16] t6050 (replace): add missing && Message-ID: <1285441627-28233-12-git-send-email-newren@gmail.com> 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 Signed-off-by: Elijah Newren --- 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