git-debrebase: Rename new-upstream-v0 command to new-upstream

[dgit.git] / tests / tests / gdr-newupstream-v0

diff --git a/tests/tests/gdr-newupstream-v0 b/tests/tests/gdr-newupstream-v0
index 4b32f02b41f964fdffd5430a9c75c87abf2d773b..536f49c218d2ea90afac7057d9d9017bf5ce4454 100755 (executable)
--- 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
 
@@ -30,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
@@ -41,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 '
@@ -50,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