X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Fgdr-newupstream-v0;h=536f49c218d2ea90afac7057d9d9017bf5ce4454;hb=375a065009f11f786116a81d8d3a1edde32fe96b;hp=1c3147e2f0fa8a80b76ac4150691891ed716344d;hpb=25ddd3eaafb2723913b6bf187596b46ec6ec3ba3;p=dgit.git

diff --git a/tests/tests/gdr-newupstream-v0 b/tests/tests/gdr-newupstream-v0
index 1c3147e2..536f49c2 100755
--- a/tests/tests/gdr-newupstream-v0
+++ b/tests/tests/gdr-newupstream-v0
@@ -2,9 +2,9 @@
 set -e
 . tests/lib
 
-t-dependencies git-buildpackage libfile-fnmatch-perl faketime
+t-dependencies NO-DGIT GDR
 
-t-setup-import gdr-convert-gbp
+t-setup-import gdr-convert-gbp-noarchive
 
 cd $p
 
@@ -12,11 +12,13 @@ cd $p
 
 new-upstream () {
 	uv=$1
+	t-git-next-date
 	git checkout make-upstream
 	git reset --hard upstream
 	t-make-new-upstream-tarball $uv
 	git push . make-upstream:upstream
 	git checkout master
+	t-git-next-date
 }
 
 new-upstream 2.1
@@ -28,7 +30,12 @@ v=2.1-1
 
 git checkout master
 
-t-git-debrebase new-upstream-v0 $v
+t-expect-fail F:'Could not determine appropriate upstream commitish' \
+t-git-debrebase new-upstream $v
+
+git tag v2.1 upstream
+
+t-git-debrebase new-upstream $v
 t-gdr-good laundered
 
 t-git-debrebase stitch
@@ -39,7 +46,6 @@ git branch ordinary
 : 'with --anchor'
 
 git reset --hard startpoint
-t-git-next-date
 
 t-git-debrebase analyse >../anal.anch
 anchor=$(perl <../anal.anch -ne '
@@ -48,7 +54,7 @@ anchor=$(perl <../anal.anch -ne '
 	exit;
 ')
 
-t-git-debrebase --anchor=$anchor -fanchor-treated new-upstream-v0 $v
+t-git-debrebase --anchor=$anchor -fanchor-treated new-upstream $v upstream
 t-gdr-good laundered
 
 t-git-debrebase stitch