summaryrefslogtreecommitdiff
path: root/dgit
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2016-10-09 01:06:32 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2016-10-10 01:01:10 +0100
commit47058aec784f7f3fba920567d634eb61c0a24712 (patch)
treef5528b7a6f2b2fcd72d5b1f9162b5c56af541df7 /dgit
parent63e1280c70d6a63a9744010c7ef690c14d95dd29 (diff)
Quilt output: Produce output like git-format-patch
Do not .-convert the message and stuff it in Description. Instead, generate a normal-looking patch with From and Subject. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'dgit')
-rwxr-xr-xdgit9
1 files changed, 3 insertions, 6 deletions
diff --git a/dgit b/dgit
index 1a5b88a..836e19d 100755
--- a/dgit
+++ b/dgit
@@ -3637,13 +3637,10 @@ sub quiltify_dpkg_commit ($$$;$) {
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;
+ $msg =~ s/\n+/\n\n/;
print O <<END or die $!;
-Description: $msg
-Author: $author
-$xinfo
+From: $author
+${xinfo}Subject: $msg
---
END