From e4cb4198abba08ab41b4076a1e1d90cd17503f01 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 5 Feb 2017 14:11:10 +0000 Subject: [PATCH] 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 --- debian/changelog | 2 ++ dgit | 1 + 2 files changed, 3 insertions(+) diff --git a/debian/changelog b/debian/changelog index b2c520fc..68fb46e0 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). diff --git a/dgit b/dgit index 7ffbb89b..9e60cdac 100755 --- 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) { -- 2.30.2