From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 18 Feb 2018 14:35:48 +0000 (+0000)
Subject: git-debrebase: test suite: test --anchor option
X-Git-Tag: archive/debian/5.0~125
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=25ddd3eaafb2723913b6bf187596b46ec6ec3ba3

git-debrebase: test suite: test --anchor option

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/NOTES.git-debrebase b/NOTES.git-debrebase
index 155d0da5..b4ffdda2 100644
--- a/NOTES.git-debrebase
+++ b/NOTES.git-debrebase
@@ -1,6 +1,4 @@
 TODO
-   --anchor option to specify commit(s) to treat as as anchor(s)
-
    reference docs
       git-debrebase(5)   data model
       git-debrebase(1)   command line
diff --git a/tests/tests/gdr-newupstream-v0 b/tests/tests/gdr-newupstream-v0
index 7bd017b8..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 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