From 25ddd3eaafb2723913b6bf187596b46ec6ec3ba3 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 18 Feb 2018 14:35:48 +0000 Subject: git-debrebase: test suite: test --anchor option Signed-off-by: Ian Jackson --- tests/tests/gdr-newupstream-v0 | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/tests/gdr-newupstream-v0 b/tests/tests/gdr-newupstream-v0 index 7bd017b..1c3147e 100755 --- a/tests/tests/gdr-newupstream-v0 +++ b/tests/tests/gdr-newupstream-v0 @@ -23,14 +23,37 @@ new-upstream 2.1 : 'maintainer hat' -git checkout master - +git branch startpoint v=2.1-1 +git checkout master + t-git-debrebase new-upstream-v0 $v t-gdr-good laundered t-git-debrebase stitch t-gdr-good stitched +git branch ordinary + +: 'with --anchor' + +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 -- cgit v1.2.3