diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2017-02-05 14:11:10 +0000 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2017-02-05 14:11:11 +0000 |
commit | e4cb4198abba08ab41b4076a1e1d90cd17503f01 (patch) | |
tree | 4aaf15b5e1fb21eb760e098043c10ed91dafe989 | |
parent | 07a8b1861c8dd294d0f30fb2fdb19228eca67aa9 (diff) |
dgit: Strip initial newline from Changes line from dpkg-parsechangelog
so as to avoid blank line in commit messages. Closes:#853093.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rw-r--r-- | debian/changelog | 2 | ||||
-rwxr-xr-x | dgit | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index b2c520f..68fb46e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ dgit (3.10~) unstable; urgency=medium Bugfixes: * dgit: Copy several user.* settings from main tree git local config to dgit private workarea. Closes:#853085. + * dgit: Strip initial newline from Changes line from dpkg-parsechangelog + so as to avoid blank line in commit messages. Closes:#853093. Test suite: * quilt-useremail: New test for user config copying (#853085). @@ -2317,6 +2317,7 @@ sub generate_commits_from_dsc () { my $authline = clogp_authline $clogp; my $changes = getfield $clogp, 'Changes'; + $changes =~ s/^\n//; # Changes: \n my $cversion = getfield $clogp, 'Version'; if (@tartrees) { |