X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Fgdr-newupstream-v0;h=1c3147e2f0fa8a80b76ac4150691891ed716344d;hb=25ddd3eaafb2723913b6bf187596b46ec6ec3ba3;hp=4480fd58cb6b99f7af4deb2d40ab3063ba7da5b2;hpb=019f49c1c81145e61b1e066efe937e93e64fee7d;p=dgit.git diff --git a/tests/tests/gdr-newupstream-v0 b/tests/tests/gdr-newupstream-v0 index 4480fd58..1c3147e2 100755 --- a/tests/tests/gdr-newupstream-v0 +++ b/tests/tests/gdr-newupstream-v0 @@ -23,14 +23,37 @@ 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