quiltify_dpkg_commit: Improve

* Coalesce $msg and $title
* New optional $xinfo argument
* Squah trailing whitespace (eg blank lines)

1 files changed, 7 insertions, 6 deletions

diff --git a/dgit b/dgit
index fcaf386..af95766 100755
--- a/dgit
+++ b/dgit
@@ -2039,19 +2039,20 @@ our $dscfn;
 
 our $fakeeditorenv = 'DGIT_FAKE_EDITOR_QUILT';
 
-sub quiltify_dpkg_commit ($$$$) {
-    my ($patchname,$title,$author,$msg) = @_;
+sub quiltify_dpkg_commit ($$$;$) {
+    my ($patchname,$author,$msg, $xinfo) = @_;
+    $xinfo //= '';
 
     mkpath '.git/dgit';
     my $descfn = ".git/dgit/quilt-description.tmp";
     open O, '>', $descfn or die "$descfn: $!";
+    $msg =~ s/\s+$//g;
     $msg =~ s/\n/\n /g;
     $msg =~ s/^\s+$/ ./mg;
     print O <<END or die $!;
-Description: $title
- $msg
+Description: $msg
 Author: $author
-
+$xinfo
 ---
 
 END
@@ -2074,7 +2075,7 @@ sub quiltify ($$) {
 
     quiltify_dpkg_commit "auto-$version-$headref-$time",
         (getfield $clogp, 'Maintainer'),
-        "Automatically generated patch ($clogp->{Version})",
+        "Automatically generated patch ($clogp->{Version})\n".
         "Last (up to) $ncommits git changes, FYI:\n\n". $msg;
 }