X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Fsetup%2Fgdr-convert-gbp;h=b563c01671358df3fd02446d60abde63e771c9ac;hp=8049d87c099e8b7b2a8b7831befda00bc35c9c75;hb=d777ebb067a22ec9c8c796caacfefcf8439759df;hpb=88169a03d4b1f865f2f5ca3adf2855c791435b17

diff --git a/tests/setup/gdr-convert-gbp b/tests/setup/gdr-convert-gbp
index 8049d87c..b563c016 100755
--- a/tests/setup/gdr-convert-gbp
+++ b/tests/setup/gdr-convert-gbp
@@ -11,6 +11,7 @@ t-dependencies GDR
 t-tstunt-parsechangelog
 
 not-gdr-processable () {
+	git branch gdr-unprocessable/$1
 	t-git-debrebase analyse | grep 'Unknown Unprocessable'
 }
 
@@ -37,7 +38,7 @@ gbp pq export
 git add debian/patches
 git commit -m "patch queue update ($0)"
 
-not-gdr-processable
+not-gdr-processable origin
 
 : 'fake up an upstream 2.0'
 git branch make-upstream upstream
@@ -61,10 +62,14 @@ done
 git checkout master
 gbp import-orig --upstream-version=2.0 ../$ust
 
-not-gdr-processable
+not-gdr-processable merge
 
 t-dch-commit -v 2.0-1 -m 'new upstream (did gbp import-orig)'
-t-dch-commit -r sid
+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
@@ -80,11 +85,19 @@ git push --set-upstream origin master
 #    debian/2.0-1                          archive/debian/2.0-1
 #    remotes/origin/master                 remotes/dgit/dgit/sid
 
+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 sid
+t-dch-commit-r
 
 $ifarchive t-dgit -wgf push-source --new
 git push
@@ -99,5 +112,3 @@ t-setup-done '' "$(echo $p*) salsa $($ifarchive echo git mirror aq)" '
 	p=example
 	t-git-next-date
 '
-
-t-ok