diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-17 23:24:22 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-17 23:24:22 +0100 |
commit | 39ae9e0589506313a69abf7a85155085b1d1147b (patch) | |
tree | bb8259a164e68ccd2604d586fdbbf2190e660f4e /tests/tests/gdr-newupstream | |
parent | 375a065009f11f786116a81d8d3a1edde32fe96b (diff) |
test suite: git-debrebase: Rename gdr-newupstream-v0 test
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'tests/tests/gdr-newupstream')
-rwxr-xr-x | tests/tests/gdr-newupstream | 65 |
1 files changed, 65 insertions, 0 deletions
diff --git a/tests/tests/gdr-newupstream b/tests/tests/gdr-newupstream new file mode 100755 index 0000000..536f49c --- /dev/null +++ b/tests/tests/gdr-newupstream @@ -0,0 +1,65 @@ +#!/bin/bash +set -e +. tests/lib + +t-dependencies NO-DGIT GDR + +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 + +: 'maintainer hat' + +git branch startpoint +v=2.1-1 + +git checkout master + +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 +t-gdr-good stitched + +git branch ordinary + +: 'with --anchor' + +git reset --hard startpoint + +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 $v upstream +t-gdr-good laundered + +t-git-debrebase stitch +t-gdr-good stitched + +git diff --quiet ordinary + +t-ok |