diff options
-rw-r--r-- | debian/changelog | 3 | ||||
-rwxr-xr-x | dgit | 9 | ||||
-rwxr-xr-x | tests/tests/quilt | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog index 3cd6e8e..1ad499d 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. @@ -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 diff --git a/tests/tests/quilt b/tests/tests/quilt index e11e1ad..37cb8d1 100755 --- a/tests/tests/quilt +++ b/tests/tests/quilt @@ -46,7 +46,7 @@ zorkmid-options-=-42 END for f in `cat debian/patches/series`; do - egrep -q '^Author.*ijackson@chiark' debian/patches/$f + egrep -q '^From.*ijackson@chiark' debian/patches/$f done t-822-field ../${p}_${v}_*.changes Changes | |