From: Alexandre Julliard Date: Mon, 27 Feb 2006 13:09:56 +0000 (+0100) Subject: git-format-patch: Always add a blank line between headers and body. X-Git-Tag: v1.3.0-rc1~123 X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=f891cb3fd6b3c2871c1a15e122366e412428204c;p=git.git git-format-patch: Always add a blank line between headers and body. If the second line of the commit message isn't empty, git-format-patch needs to add an empty line in order to generate a properly formatted mail. Otherwise git-rebase drops the rest of the commit message. Signed-off-by: Alexandre Julliard Signed-off-by: Junio C Hamano --- diff --git a/git-format-patch.sh b/git-format-patch.sh index eb75de46..2bd26395 100755 --- a/git-format-patch.sh +++ b/git-format-patch.sh @@ -174,7 +174,7 @@ titleScript=' process_one () { perl -w -e ' my ($keep_subject, $num, $signoff, $commsg) = @ARGV; -my ($signoff_pattern, $done_header, $done_subject, $signoff_seen, +my ($signoff_pattern, $done_header, $done_subject, $done_separator, $signoff_seen, $last_was_signoff); if ($signoff) { @@ -228,6 +228,11 @@ while () { $done_subject = 1; next; } + unless ($done_separator) { + print "\n"; + $done_separator = 1; + next if (/^$/); + } $last_was_signoff = 0; if (/Signed-off-by:/i) {