diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2019-07-18 00:35:12 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2019-07-18 00:35:12 +0100 |
commit | 2da6897edd5eb12f80b64c404c55e2eb86efddbc (patch) | |
tree | 062769ab1e9ac36b81ea702f3189cc6ae26790ec | |
parent | 2a182b006a51cecd6b5bbd4f07fcd8d412db0353 (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>
-rwxr-xr-x | tests/setup/gbp | 2 | ||||
-rwxr-xr-x | tests/tests/gbp-orig | 2 |
2 files changed, 3 insertions, 1 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" ' diff --git a/tests/tests/gbp-orig b/tests/tests/gbp-orig index beace24..c843663 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/. |