diff options
| author | Alexandre Julliard <julliard@winehq.org> | 2006-02-27 14:09:56 +0100 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-02-27 11:01:47 -0800 |
| commit | f891cb3fd6b3c2871c1a15e122366e412428204c (patch) | |
| tree | 54a00c0da045d04ef7ac1a63446965d6e556296e | |
| parent | combine-diff: Honour -z option correctly. (diff) | |
| download | git-f891cb3fd6b3c2871c1a15e122366e412428204c.tar.gz git-f891cb3fd6b3c2871c1a15e122366e412428204c.zip | |
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 <julliard@winehq.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rwxr-xr-x | git-format-patch.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/git-format-patch.sh b/git-format-patch.sh index eb75de4601..2bd26395ec 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 (<FH>) { $done_subject = 1; next; } + unless ($done_separator) { + print "\n"; + $done_separator = 1; + next if (/^$/); + } $last_was_signoff = 0; if (/Signed-off-by:/i) { |