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

diff --git a/tests/tests/gdr-newupstream-v0 b/tests/tests/gdr-newupstream-v0
index 7bd017b8..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,25 +12,54 @@ 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
 
 : 'maintainer hat'
 
+git branch startpoint
+v=2.1-1
+
 git checkout master
 
-v=2.1-1
+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
+t-gdr-good stitched
+
+git branch ordinary
+
+: 'with --anchor'
 
-t-git-debrebase new-upstream-v0 $v
+git reset --hard startpoint
+
+t-git-debrebase analyse >../anal.anch
+anchor=$(perl <../anal.anch -ne '
+	next unless m/^(\w+) Anchor\s/;
+	print $1,"\n";
+	exit;
+')
+
+t-git-debrebase --anchor=$anchor -fanchor-treated new-upstream $v upstream
 t-gdr-good laundered
 
 t-git-debrebase stitch
 t-gdr-good stitched
 
+git diff --quiet ordinary
+
 t-ok