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 1b73d3931a34571d9adebb903bae1fb5f58a5c42..d8675fe18ff599f049651d1e590830b245b10e91 100755 (executable)
--- 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 beace24c1f84e5681a4e9747ab633e8656b171a8..c8436630e880a03711f5681bbf16708302b16eb6 100755 (executable)
--- 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/.