summaryrefslogtreecommitdiff
path: root/tests/tests/drs-push-masterupdate
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2015-07-11 00:35:28 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2015-07-11 00:36:16 +0100
commitc17699d17f17f6ea105b7440ff95fa39eebb54a6 (patch)
tree1f5f42ce8759699b49be63662f151e9f111de66e /tests/tests/drs-push-masterupdate
parentf1acf7af0d90aca442d1caaa1dbc901ff6adcfbc (diff)
Test suite: Replace open-coded $tmp/git/$p.git
Diffstat (limited to 'tests/tests/drs-push-masterupdate')
-rwxr-xr-xtests/tests/drs-push-masterupdate6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/tests/drs-push-masterupdate b/tests/tests/drs-push-masterupdate
index b5523e8..9d2e632 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
@@ -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