From 0067ecc82b2dbef64d3768484eb6a1b4ca2c27d2 Mon Sep 17 00:00:00 2001 From: Felipe Contreras Date: Fri, 24 May 2013 21:29:36 -0500 Subject: [PATCH] remote-bzr: simplify test checks Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano --- contrib/remote-helpers/test-bzr.sh | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/contrib/remote-helpers/test-bzr.sh b/contrib/remote-helpers/test-bzr.sh index f215b26bac..dce281f911 100755 --- a/contrib/remote-helpers/test-bzr.sh +++ b/contrib/remote-helpers/test-bzr.sh @@ -18,15 +18,8 @@ if ! python -c 'import bzrlib'; then fi check () { - ( - cd $1 && - git log --format='%s' -1 && - git symbolic-ref HEAD - ) > actual && - ( - echo $2 && - echo "refs/heads/$3" - ) > expected && + echo $3 > expected && + git --git-dir=$1/.git log --format='%s' -1 $2 > actual test_cmp expected actual } @@ -42,7 +35,7 @@ test_expect_success 'cloning' ' ) && git clone "bzr::bzrrepo" gitrepo && - check gitrepo one master + check gitrepo HEAD one ' test_expect_success 'pulling' ' @@ -54,7 +47,7 @@ test_expect_success 'pulling' ' (cd gitrepo && git pull) && - check gitrepo two master + check gitrepo HEAD two ' test_expect_success 'pushing' ' @@ -89,7 +82,7 @@ test_expect_success 'roundtrip' ' (cd gitrepo && git pull && git push) && - check gitrepo four master && + check gitrepo HEAD four && ( cd gitrepo && -- 2.11.4.GIT