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=4b32f02b41f964fdffd5430a9c75c87abf2d773b;hp=4480fd58cb6b99f7af4deb2d40ab3063ba7da5b2;hb=47d01bce1e3bf445059afb2ccee4531846fcc68a;hpb=019f49c1c81145e61b1e066efe937e93e64fee7d

diff --git a/tests/tests/gdr-newupstream-v0 b/tests/tests/gdr-newupstream-v0
index 4480fd58..4b32f02b 100755
--- a/tests/tests/gdr-newupstream-v0
+++ b/tests/tests/gdr-newupstream-v0
@@ -12,25 +12,50 @@ 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-git-debrebase new-upstream-v0 $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 upstream
+git reset --hard startpoint
+t-git-next-date
+
+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-v0 $v
 t-gdr-good laundered
 
 t-git-debrebase stitch
 t-gdr-good stitched
 
+git diff --quiet ordinary
+
 t-ok