projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge part of 'jc/diff'
[git.git]
/
git-format-patch.sh
diff --git
a/git-format-patch.sh
b/git-format-patch.sh
index
eb75de4
..
2bd2639
100755
(executable)
--- 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;
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) {
$last_was_signoff);
if ($signoff) {
@@
-228,6
+228,11
@@
while (<FH>) {
$done_subject = 1;
next;
}
$done_subject = 1;
next;
}
+ unless ($done_separator) {
+ print "\n";
+ $done_separator = 1;
+ next if (/^$/);
+ }
$last_was_signoff = 0;
if (/Signed-off-by:/i) {
$last_was_signoff = 0;
if (/Signed-off-by:/i) {