git-debrebase: Only make finalised changelog entries

[dgit.git] / tests / tests / gdr-newupstream-v0

diff --git a/tests/tests/gdr-newupstream-v0 b/tests/tests/gdr-newupstream-v0
index 7bd017b81801eea5352db40b321304d554221def..9b283c0b7e328bf0b527c4973117247de819274c 100755 (executable)
--- a/tests/tests/gdr-newupstream-v0
+++ b/tests/tests/gdr-newupstream-v0
@@ -12,25 +12,49 @@ cd $p
 
 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 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-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