Test suite: drs-push-rejects: Break out re-prep (nfc)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/tests/tests/drs-push-rejects b/tests/tests/drs-push-rejects
index 6f2797a04fbbb49bffefc4b99278657bc3f3cbca..07abf4aec8e1cf7dc95755b529a3c9b7965d73d4 100755 (executable)
--- a/tests/tests/drs-push-rejects
+++ b/tests/tests/drs-push-rejects
@@ -27,10 +27,13 @@ mustsucceed () {
 
 prep () {
        local suite=$1
 
 prep () {
        local suite=$1

-       local csuite=$2
+       csuite=$2

        cp $tmp/masters/* $tmp/.
        tag_signer='-u Senatus'
        tag_message="$p release $version for $suite ($csuite) [dgit]"
        cp $tmp/masters/* $tmp/.
        tag_signer='-u Senatus'
        tag_message="$p release $version for $suite ($csuite) [dgit]"

+       re-prep
+}
+re-prep () {

        tag_name=$tagpfx/$version
        push_spec1="HEAD:refs/dgit/$csuite"
        push_spec2="refs/tags/$tag_name"
        tag_name=$tagpfx/$version
        push_spec1="HEAD:refs/dgit/$csuite"
        push_spec2="refs/tags/$tag_name"