summaryrefslogtreecommitdiff
path: root/contrib/remote-helpers
diff options
context:
space:
mode:
authorLibravatar Felipe Contreras <felipe.contreras@gmail.com>2013-05-24 21:29:36 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-05-28 07:59:31 -0700
commit0067ecc82b2dbef64d3768484eb6a1b4ca2c27d2 (patch)
tree07a349e5ec0d269c06c1b67d4b803fa085e5d688 /contrib/remote-helpers
parentremote-hg: add tests for 'master' bookmark (diff)
downloadtgif-0067ecc82b2dbef64d3768484eb6a1b4ca2c27d2.tar.xz
remote-bzr: simplify test checks
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/remote-helpers')
-rwxr-xr-xcontrib/remote-helpers/test-bzr.sh17
1 files 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 &&