Merge branch 'jc/simple-add-must-be-a-no-op'

diff --git a/contrib/remote-helpers/test-bzr.sh b/contrib/remote-helpers/test-bzr.sh
index b54313e69eee6e0f1c840eade1e639d27beeba2b..dce281f91195cde4937b935910ec73f597bb826a 100755 (executable)
--- 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
 }
 
@@ -41,8 +34,8 @@ test_expect_success 'cloning' '
        bzr commit -m one
        ) &&
 
-       git clone "bzr::$PWD/bzrrepo" gitrepo &&
-       check gitrepo one master
+       git clone "bzr::bzrrepo" gitrepo &&
+       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 &&
@@ -216,7 +209,7 @@ test_expect_success 'fetch utf-8 filenames' '
        ) &&
 
        (
-       git clone "bzr::$PWD/bzrrepo" gitrepo &&
+       git clone "bzr::bzrrepo" gitrepo &&
        cd gitrepo &&
        git -c core.quotepath=false ls-files > ../actual
        ) &&
@@ -242,7 +235,7 @@ test_expect_success 'push utf-8 filenames' '
        ) &&
 
        (
-       git clone "bzr::$PWD/bzrrepo" gitrepo &&
+       git clone "bzr::bzrrepo" gitrepo &&
        cd gitrepo &&
 
        echo test >> "ærø" &&
@@ -268,7 +261,7 @@ test_expect_success 'pushing a merge' '
        bzr commit -m one
        ) &&
 
-       git clone "bzr::$PWD/bzrrepo" gitrepo &&
+       git clone "bzr::bzrrepo" gitrepo &&
 
        (
        cd bzrrepo &&
@@ -319,7 +312,7 @@ test_expect_success 'proper bzr repo' '
        ) &&
 
        (
-       git clone "bzr::$PWD/bzrrepo" gitrepo &&
+       git clone "bzr::bzrrepo" gitrepo &&
        cd gitrepo &&
        git for-each-ref --format "%(refname:short)" refs/remotes/origin > ../actual
        ) &&
@@ -342,7 +335,7 @@ test_expect_success 'strip' '
        bzr commit -m two
        ) &&
 
-       git clone "bzr::$PWD/bzrrepo" gitrepo &&
+       git clone "bzr::bzrrepo" gitrepo &&
 
        (
        cd bzrrepo &&