X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Fdrs-push-masterupdate;h=8457b59db43207d1eb08162f1d4b23e7cc89657b;hb=d436b26183c219a8633f84aa39cf991fd8b6de4d;hp=b5523e8234a33122b42b6e5bd1cd4118ea5934d7;hpb=fcc2f812b0c70b67d037b8c141825fef5032452b;p=dgit.git

diff --git a/tests/tests/drs-push-masterupdate b/tests/tests/drs-push-masterupdate
index b5523e82..8457b59d 100755
--- a/tests/tests/drs-push-masterupdate
+++ b/tests/tests/drs-push-masterupdate
@@ -16,9 +16,9 @@ t-dgit build
 t-dgit push --new
 
 push_and_check () {
-	git push $tmp/git/$p.git $1
+	git push $dgitrepo $1
 
-	oldmaster=`cd $tmp/git/$p.git && t-git-get-ref refs/heads/master`
+	oldmaster=`cd $dgitrepo && t-git-get-ref refs/heads/master`
 
 	t-refs-same-start
 	git checkout master
@@ -30,7 +30,7 @@ push_and_check () {
 }
 
 t-check-master-undisturbed () {
-	local master=`t-git-get-ref refs/heads/master`
+	local master; master=`t-git-get-ref refs/heads/master`
 	if [ x$master != x$oldmaster ]; then fail "bad update to master"; fi
 }
 
@@ -38,7 +38,7 @@ t_check_pushed_master=t-check-master-undisturbed
 
 git checkout -b divergent common-ancestor
 git commit --allow-empty -m 'Has common ancestor'
-git push $tmp/git/$p.git HEAD:master
+git push $dgitrepo HEAD:master
 
 push_and_check HEAD:master
 
@@ -47,4 +47,4 @@ git commit --allow-empty -m 'Has no common ancestor'
 
 push_and_check +HEAD:master
 
-echo done.
+t-ok