diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2018-07-19 01:09:16 +0800 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2018-07-19 01:09:16 +0800 |
| commit | d0492d8f40b05ea5f4d378cd34221a9cd66cbfcd (patch) | |
| tree | d79f415f344a81aca8d18e916b7016a84aec5793 /tests/setup | |
| parent | eb07108c1051f227c83de01781f498a330faae43 (diff) | |
| parent | 15fbfc94b8c6a08cffdf0f9a7ed5870252ad4416 (diff) | |
Merge tag 'debian/5.10' into stretch-bpo
dgit release 5.10 for unstable (sid) [dgit]
[dgit distro=debian]
# gpg: Signature made Sun 15 Jul 2018 01:12:02 AM CST
# gpg: using RSA key 559AE46C2D6B6D3265E7CBA1E3E3392348B50D39
# gpg: Can't check signature: No public key
Diffstat (limited to 'tests/setup')
| -rwxr-xr-x | tests/setup/examplegit | 2 | ||||
| -rwxr-xr-x | tests/setup/gdr-convert-gbp | 8 | ||||
| -rwxr-xr-x | tests/setup/gnupg | 2 |
3 files changed, 3 insertions, 9 deletions
diff --git a/tests/setup/examplegit b/tests/setup/examplegit index 112e27a..48864d4 100755 --- a/tests/setup/examplegit +++ b/tests/setup/examplegit @@ -49,5 +49,3 @@ t-commit Sid push-to master sid t-setup-done 'p v suitespecs majorv revision' "aq git mirror $p" - -t-ok diff --git a/tests/setup/gdr-convert-gbp b/tests/setup/gdr-convert-gbp index e523fd3..6ec374d 100755 --- a/tests/setup/gdr-convert-gbp +++ b/tests/setup/gdr-convert-gbp @@ -64,7 +64,7 @@ gbp import-orig --upstream-version=2.0 ../$ust not-gdr-processable t-dch-commit -v 2.0-1 -m 'new upstream (did gbp import-orig)' -t-dch-commit -r sid +t-dch-commit-r $ifarchive t-archive-none $p $ifarchive t-git-none @@ -84,9 +84,9 @@ t-git-debrebase -fupstream-has-debian convert-from-gbp v=2.0-2 t-dch-commit -v $v -m 'switch to git-debrebase, no other changes' -t-dch-commit -r sid +t-dch-commit-r -$ifarchive t-dgit -wgf push-source --new --overwrite +$ifarchive t-dgit -wgf push-source --new git push cd .. @@ -99,5 +99,3 @@ t-setup-done '' "$(echo $p*) salsa $($ifarchive echo git mirror aq)" ' p=example t-git-next-date ' - -t-ok diff --git a/tests/setup/gnupg b/tests/setup/gnupg index 7a164ef..56e4e66 100755 --- a/tests/setup/gnupg +++ b/tests/setup/gnupg @@ -30,5 +30,3 @@ gpg --list-secret t-setup-done 'DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG' \ 'gnupg' "$setup" - -t-ok |