X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Fsetup%2Fgdr-convert-gbp;h=93ed4b60b028d4980dbfc772e2b90821cb4692f7;hb=79e98851edb8daa0f866fb30adab21b3f12989a9;hp=a3baf2d722e1eb61a0e144c16c856b52ee63719f;hpb=1146c44cdb7a593d61318b9db4da82e51cbd476c;p=dgit.git

diff --git a/tests/setup/gdr-convert-gbp b/tests/setup/gdr-convert-gbp
index a3baf2d7..93ed4b60 100755
--- a/tests/setup/gdr-convert-gbp
+++ b/tests/setup/gdr-convert-gbp
@@ -15,28 +15,7 @@ not-gdr-processable () {
 	t-git-debrebase analyse | grep 'Unknown Unprocessable'
 }
 
-p=example
-t-worktree 1.1
-
-cd example
-
-: 'fake up some kind of upstream'
-git checkout -b upstream quilt-tip
-rm -rf debian
-mkdir debian
-echo junk >debian/rules
-git add debian
-git commit -m "an upstream retcon ($0)"
-
-: 'fake up that our quilt-tip was descended from upstream'
-git checkout quilt-tip
-git merge --no-edit -s ours upstream
-
-: 'fake up that our quilt-tip had the patch queue in it'
-git checkout patch-queue/quilt-tip
-gbp pq export
-git add debian/patches
-git commit -m "patch queue update ($0)"
+t-gdr-gbp-import-core-with-queue
 
 not-gdr-processable origin
 
@@ -44,10 +23,6 @@ not-gdr-processable origin
 git branch make-upstream upstream
 t-make-new-upstream-tarball 2.0
 
-: 'make branch names more conventional'
-git branch -D master
-git branch -m quilt-tip master
-
 for b in \
 		quilt-tip-2		\
 		gitish-only		\
@@ -67,6 +42,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 +63,13 @@ 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
 t-dch-commit -v $v -m 'switch to git-debrebase, no other changes'
 t-dch-commit-r