X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Fgdr-newupstream;h=0724459ea8fc9a9dbfbc83eb61dcf50d45634ef6;hb=fc36b5b71a33e555d92d368beffeb2735fbe0010;hp=536f49c218d2ea90afac7057d9d9017bf5ce4454;hpb=39ae9e0589506313a69abf7a85155085b1d1147b;p=dgit.git

diff --git a/tests/tests/gdr-newupstream b/tests/tests/gdr-newupstream
index 536f49c2..0724459e 100755
--- a/tests/tests/gdr-newupstream
+++ b/tests/tests/gdr-newupstream
@@ -1,27 +1,18 @@
 #!/bin/bash
 set -e
+autoimport=
 . tests/lib
 
 t-dependencies NO-DGIT GDR
 
+t-tstunt-parsechangelog
 t-setup-import gdr-convert-gbp-noarchive
 
 cd $p
 
 : 'upstream hat'
 
-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
+t-gdr-prep-new-upstream 2.1
 
 : 'maintainer hat'
 
@@ -35,8 +26,10 @@ t-git-debrebase new-upstream $v
 
 git tag v2.1 upstream
 
-t-git-debrebase new-upstream $v
+t-git-debrebase new-upstream ${v%-*}
+
 t-gdr-good laundered
+git reflog | egrep 'debrebase new-upstream.*checkout'
 
 t-git-debrebase stitch
 t-gdr-good stitched
@@ -54,8 +47,11 @@ anchor=$(perl <../anal.anch -ne '
 	exit;
 ')
 
+GIT_REFLOG_ACTION='STUNT-RLA' \
 t-git-debrebase --anchor=$anchor -fanchor-treated new-upstream $v upstream
 t-gdr-good laundered
+git reflog | egrep 'STUNT-RLA: debrebase new-upstream'
+git reflog | egrep 'STUNT-RLA: debrebase: launder for new upstream'
 
 t-git-debrebase stitch
 t-gdr-good stitched