X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Fdrs-push-masterupdate;h=9d2e6320705c30326fcae1ac79d2584a22239f8d;hb=816ed64edd5f42c114bda166878008e6a3877215;hp=b5523e8234a33122b42b6e5bd1cd4118ea5934d7;hpb=fcc2f812b0c70b67d037b8c141825fef5032452b;p=dgit.git diff --git a/tests/tests/drs-push-masterupdate b/tests/tests/drs-push-masterupdate index b5523e82..9d2e6320 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