From 47058aec784f7f3fba920567d634eb61c0a24712 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 9 Oct 2016 01:06:32 +0100 Subject: [PATCH 1/1] 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 --- debian/changelog | 3 +++ dgit | 9 +++------ tests/tests/quilt | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3cd6e8e6..1ad499d7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,6 +28,9 @@ dgit (1.5~~) unstable; urgency=medium for filename creation (makes filename deterministic in test suite). * New --overwrite option, replaces need to for user to use git merge -s ours. Closes:#838718. + * When generating quilt patches from git commits, make patches that + look quite like git-format-patch output (rather than strange things + based on an obselete interpretation of DEP-3). Infrastructure: * Better error handling in dgit-repos-policy-debian. diff --git a/dgit b/dgit index 1a5b88a5..836e19d4 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 <