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>

diff --git a/debian/changelog b/debian/changelog
index b2c520fcce4df856e30f54ece1d309381ea49d6b..68fb46e0628e9c29c5d0d5a28d0f5c54b3ab8729 100644 (file)
--- 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).

diff --git a/dgit b/dgit
index 7ffbb89b8303d895a6520bb063137c3f2f7c4824..9e60cdac91bb892a392b96502a71199672d835f0 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -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) {