From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 22 Apr 2018 16:20:09 +0000 (+0100)
Subject: git-debrebase: Only make finalised changelog entries
X-Git-Tag: archive/debian/5.0~71
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=31c54246f7285b92c2649625422af08c4828d555;ds=sidebyside

git-debrebase: Only make finalised changelog entries

Unfortunately, finalised UNRELEASED has become the dominant convention
in Debian.  So conform to that.

Also this breaks a test, which assumed that the operation date did not
leak into the output tree.  But, sadly, now it does.

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

diff --git a/git-debrebase b/git-debrebase
index 59b15aa3..fcca5b1a 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -1234,6 +1234,10 @@ sub cmd_new_upstream_v0 () {
  "[git-debrebase anchor: new upstream $new_upstream_version, merge]",
             ];
 
+	my $clogsignoff = cmdoutput qw(git show),
+	    '--pretty=format:%an <%ae>  %aD',
+	    $new_bw;
+
 	# Now we have to add a changelog stanza so the Debian version
 	# is right.
 	die if unlink "debian";
@@ -1250,7 +1254,7 @@ $p ($new_version) UNRELEASED; urgency=medium
 
   * Update to new upstream version $new_upstream_version.
 
- -- 
+ -- $clogsignoff
 
 END
 	close CN or die $!;
diff --git a/tests/tests/gdr-newupstream-v0 b/tests/tests/gdr-newupstream-v0
index 4b32f02b..9b283c0b 100755
--- a/tests/tests/gdr-newupstream-v0
+++ b/tests/tests/gdr-newupstream-v0
@@ -41,7 +41,6 @@ git branch ordinary
 : 'with --anchor'
 
 git reset --hard startpoint
-t-git-next-date
 
 t-git-debrebase analyse >../anal.anch
 anchor=$(perl <../anal.anch -ne '