From: Ian Jackson Date: Thu, 15 Feb 2018 19:09:11 +0000 (+0000) Subject: test suite: gbp2gdr: drop junk at the end X-Git-Tag: archive/debian/5.0~228 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=0bde23e2e2034cc4e436f131297930ca0a16e0c6;ds=sidebyside test suite: gbp2gdr: drop junk at the end Signed-off-by: Ian Jackson --- diff --git a/tests/setup/gbp2gdr b/tests/setup/gbp2gdr index 5c2b969f..ddb0d031 100755 --- a/tests/setup/gbp2gdr +++ b/tests/setup/gbp2gdr @@ -82,56 +82,3 @@ t-dgit -wgf push-source --new --overwrite git push t-ok -exit 0 - - -git checkout quilt-tip -git merge --no-edit --allow-unrelated-histories -Xtheirs --no-commit upstream -git checkout HEAD -- debian -git commit --no-edit - - - -false - -revision=1 - -push-to () { - t-refs-same-start - t-ref-head - t-dgit build - t-dgit push --new $2 - t-pushed-good $1 $2 - t-archive-process-incoming $2 -} - -echo ancestor >which -git add which -t-commit Ancestor '' stable -push-to master stable - -git checkout -b stable - -echo stable >which -git add which -t-commit Stable '' stable -push-to stable stable - -git checkout master - -majorv=2 -revision=0 - -echo sid >which -git add which -t-commit Sid -push-to master sid - -echo sid-again >>which -git add which -t-commit Sid -push-to master sid - -t-setup-done 'p v suitespecs majorv revision' "aq git mirror $p" - -t-ok