diff options
| -rwxr-xr-x | tests/setup/gdr-convert-gbp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/tests/setup/gdr-convert-gbp b/tests/setup/gdr-convert-gbp index a3f0284..b563c01 100755 --- a/tests/setup/gdr-convert-gbp +++ b/tests/setup/gdr-convert-gbp @@ -67,6 +67,10 @@ not-gdr-processable merge t-dch-commit -v 2.0-1 -m 'new upstream (did gbp import-orig)' t-dch-commit-r +echo garbage >debian/patches/garbage +git add debian/patches/garbage +git commit -m 'add garbage' debian/patches/garbage + $ifarchive t-archive-none $p $ifarchive t-git-none $ifarchive t-dgit -wgf --gbp push-source --new @@ -84,8 +88,11 @@ git push --set-upstream origin master t-expect-fail E:'identical in upstream files' \ t-git-debrebase -fupstream-has-debian convert-from-gbp upstream/2.0~ +t-expect-fail E:'Unused patch file garbage will be discarded' \ t-git-debrebase -fupstream-has-debian convert-from-gbp +t-git-debrebase -fupstream-has-debian -funused-patches convert-from-gbp + git branch converted-from-gbp v=2.0-2 |