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 155d0da56cc8c87b45ba8e20d8ec7588840a6311..b4ffdda23e760a98b165873470d9b8b6c4967f72 100644 (file)
--- a/NOTES.git-debrebase
+++ b/NOTES.git-debrebase
@@ -1,6 +1,4 @@
 TODO
 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
    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 7bd017b81801eea5352db40b321304d554221def..1c3147e2f0fa8a80b76ac4150691891ed716344d 100755 (executable)
--- a/tests/tests/gdr-newupstream-v0
+++ b/tests/tests/gdr-newupstream-v0
@@ -23,14 +23,37 @@ new-upstream 2.1
 
 : 'maintainer hat'
 
 
 : 'maintainer hat'
 

-git checkout master
-
+git branch startpoint

 v=2.1-1
 
 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
 
 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
 t-ok