X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Ftests%2Fdrs-push-masterupdate;h=9d2e6320705c30326fcae1ac79d2584a22239f8d;hp=cc77b77ab9c01da65bd7923504013edc6c962b72;hb=79670972590a2b34c20a85929b28c3ce7425c55f;hpb=c963c8da4cb34cc4ddddaf2b936dbfef10f74e58 diff --git a/tests/tests/drs-push-masterupdate b/tests/tests/drs-push-masterupdate index cc77b77a..9d2e6320 100755 --- a/tests/tests/drs-push-masterupdate +++ b/tests/tests/drs-push-masterupdate @@ -16,17 +16,17 @@ 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 dgit/sid + git checkout master t-commit 'Empty update' t-dgit build t-dgit push --new - t-pushed-good dgit/sid + t-pushed-good master } t-check-master-undisturbed () { @@ -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