From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 19 Aug 2018 18:19:18 +0000 (+0100)
Subject: test suite: gdr-convert-gbp: test snag on unused patches
X-Git-Tag: archive/debian/6.7~38
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=d777ebb067a22ec9c8c796caacfefcf8439759df;ds=sidebyside

test suite: gdr-convert-gbp: test snag on unused patches

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/tests/setup/gdr-convert-gbp b/tests/setup/gdr-convert-gbp
index a3f0284c..b563c016 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