summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-04-22 17:20:09 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-06-16 16:07:01 +0100
commit31c54246f7285b92c2649625422af08c4828d555 (patch)
treec680419ff964fd9a4525f3f9e5fe51446e1a6ac7
parent17ffe84e1d4c3dcae3dfc6edb8369d913b4dd80b (diff)
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>
-rwxr-xr-xgit-debrebase6
-rwxr-xr-xtests/tests/gdr-newupstream-v01
2 files changed, 5 insertions, 2 deletions
diff --git a/git-debrebase b/git-debrebase
index 59b15aa..fcca5b1 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 4b32f02..9b283c0 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 '