From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 17 Jul 2019 23:35:12 +0000 (+0100)
Subject: test suite: setup/gbp: Make the result the master branch
X-Git-Tag: archive/debian/9.3~5
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=2da6897edd5eb12f80b64c404c55e2eb86efddbc

test suite: setup/gbp: Make the result the master branch

This means we can drop --git-ignore-branch from gbp-orig.

No overall functional change.

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

diff --git a/tests/setup/gbp b/tests/setup/gbp
index 1b73d393..d8675fe1 100755
--- a/tests/setup/gbp
+++ b/tests/setup/gbp
@@ -38,6 +38,8 @@ t-git-pseudo-merge -m 'gbp-orig pseudomerge' upstream
 
 v=1.0-1
 
+git checkout -B master
+
 cd ..
 
 t-setup-done 'v' "$(echo $p*) git mirror aq" '
diff --git a/tests/tests/gbp-orig b/tests/tests/gbp-orig
index beace24c..c8436630 100755
--- a/tests/tests/gbp-orig
+++ b/tests/tests/gbp-orig
@@ -12,7 +12,7 @@ t-tstunt-lintian
 
 : '----- let gbp build a .orig for comparison -----'
 
-gbp buildpackage --git-ignore-branch --git-no-sign-tags -us -uc
+gbp buildpackage --git-no-sign-tags -us -uc
 
 mkdir ../gbp-output
 mv ../*1.0* ../gbp-output/.