X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Ftests%2Fgdr-newupstream-v0;h=536f49c218d2ea90afac7057d9d9017bf5ce4454;hp=10404a55657b8e8123e38e4fab94b28145e09cfa;hb=375a065009f11f786116a81d8d3a1edde32fe96b;hpb=f7e37ea9f83b46c5efa4152b36c6cc0f4b91fadd diff --git a/tests/tests/gdr-newupstream-v0 b/tests/tests/gdr-newupstream-v0 index 10404a55..536f49c2 100755 --- a/tests/tests/gdr-newupstream-v0 +++ b/tests/tests/gdr-newupstream-v0 @@ -2,9 +2,9 @@ set -e . tests/lib -t-dependencies GDR +t-dependencies NO-DGIT GDR -t-setup-import gdr-convert-gbp +t-setup-import gdr-convert-gbp-noarchive cd $p @@ -31,11 +31,11 @@ v=2.1-1 git checkout master t-expect-fail F:'Could not determine appropriate upstream commitish' \ -t-git-debrebase new-upstream-v0 $v +t-git-debrebase new-upstream $v git tag v2.1 upstream -t-git-debrebase new-upstream-v0 $v +t-git-debrebase new-upstream $v t-gdr-good laundered t-git-debrebase stitch @@ -54,7 +54,7 @@ anchor=$(perl <../anal.anch -ne ' exit; ') -t-git-debrebase --anchor=$anchor -fanchor-treated new-upstream-v0 $v upstream +t-git-debrebase --anchor=$anchor -fanchor-treated new-upstream $v upstream t-gdr-good laundered t-git-debrebase stitch