X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Ftrustingpolicy-replay;h=8cc205ce1dfdfece7d1f89840f9e6ecb0cbda913;hb=816ed64edd5f42c114bda166878008e6a3877215;hp=517f98a08014759fd13b22bb095472e59087cfd1;hpb=d6be829bf56e699d27d388026d4af7ab710ba328;p=dgit.git diff --git a/tests/tests/trustingpolicy-replay b/tests/tests/trustingpolicy-replay index 517f98a0..8cc205ce 100755 --- a/tests/tests/trustingpolicy-replay +++ b/tests/tests/trustingpolicy-replay @@ -20,7 +20,7 @@ t-dgit build t-dgit push t-rm-dput-dropping -git checkout test-dummy/1.0 +git checkout $tagpfx/1.0 t-dgit build t-dgit push --deliberately-fresh-repo @@ -28,8 +28,8 @@ remote="`git config dgit-distro.test-dummy.git-url`/$p.git" t-expect-push-fail 'Replay of previously-rewound upload' \ git push "$remote" \ - test-dummy/1.1 \ - test-dummy/1.1~0:refs/dgit/sid + $tagpfx/1.1 \ + $tagpfx/1.1~0:refs/dgit/sid git checkout master @@ -57,11 +57,11 @@ prepare-replay () { attempt-replay () { local mpat=$1 - git show test-dummy/$replayv | grep -e $delib + git show $tagpfx/$replayv | grep -e $delib t-expect-push-fail "$mpat" \ git push "$remote" \ - test-dummy/$replayv \ - +test-dummy/$replayv~0:refs/dgit/sid + $tagpfx/$replayv \ + +$tagpfx/$replayv~0:refs/dgit/sid } prepare-replay --deliberately-fresh-repo @@ -77,7 +77,7 @@ t-commit 'later version to stop not fast forward rewinding' t-dgit build t-dgit push -attempt-replay "does not declare previously tags/test-dummy/$v" +attempt-replay "does not declare previously tags/$tagpfx/$v" echo ok.