summaryrefslogtreecommitdiff
path: root/tests/setup
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2019-07-18 00:35:12 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2019-07-18 00:35:12 +0100
commit2da6897edd5eb12f80b64c404c55e2eb86efddbc (patch)
tree062769ab1e9ac36b81ea702f3189cc6ae26790ec /tests/setup
parent2a182b006a51cecd6b5bbd4f07fcd8d412db0353 (diff)
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>
Diffstat (limited to 'tests/setup')
-rwxr-xr-xtests/setup/gbp2
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/setup/gbp b/tests/setup/gbp
index 1b73d39..d8675fe 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" '