diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2018-07-12 08:33:17 +0100 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2018-07-12 08:33:17 +0100 |
| commit | ae8f33be945323e02e670a97c8ac6d42a0e1be40 (patch) | |
| tree | 2bbf98c464b32b8ede618bf93929741246b81b5f /tests/tests/gdr-makepatches7 | |
| parent | 4a142fe137c1bed5a0cb5d14c41adcb3355458c4 (diff) | |
| parent | 7166dbc963a9c01ce62a0564bb7b905156adb560 (diff) | |
Merge tag 'debian/5.8' into stretch-bpo
dgit release 5.8 for unstable (sid) [dgit]
[dgit distro=debian]
# gpg: Signature made Sun 08 Jul 2018 11:43:29 BST
# gpg: using RSA key 559AE46C2D6B6D3265E7CBA1E3E3392348B50D39
# gpg: Can't check signature: No public key
Diffstat (limited to 'tests/tests/gdr-makepatches7')
| -rwxr-xr-x | tests/tests/gdr-makepatches7 | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/tests/tests/gdr-makepatches7 b/tests/tests/gdr-makepatches7 index 9c39710..02ea7ab 100755 --- a/tests/tests/gdr-makepatches7 +++ b/tests/tests/gdr-makepatches7 @@ -8,6 +8,15 @@ t-setup-import gdr-convert-gbp cd $p +git checkout upstream/2.0 +echo '*patch*' >>.gitignore +git commit -m nasty .gitignore +git tag v2.1 +GZIP=-1 git archive -o ../${p}_2.1.orig.tar.gz --prefix ${p}/ v2.1 + +git checkout master +t-git-debrebase new-upstream 2.1-1 + t-some-changes for-rebase-fixup m t-git-debrebase |