aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Witten <mfwitten@gmail.com>2009-04-13 13:23:50 -0500
committerJunio C Hamano <gitster@pobox.com>2009-04-14 01:55:58 -0700
commit40e6e8a0c485e618be366f13247fd745ac00b911 (patch)
tree4ee37965707723fd3303458e31104fccdd1e4d9f
parentdd602bf8ec9b6ef422e5cf8a490c381c0bb037ed (diff)
downloadgit-40e6e8a0c485e618be366f13247fd745ac00b911.tar.gz
git-40e6e8a0c485e618be366f13247fd745ac00b911.tar.xz
send-email: Handle "GIT:" rather than "GIT: " during --compose
This should make things a little more robust in terms of user input; before, even the program got it wrong by outputting a line with only "GIT:", which was left in place as a header, because there would be no following space character. Signed-off-by: Michael Witten <mfwitten@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xgit-send-email.perl4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-send-email.perl b/git-send-email.perl
index 172b53c2d..7526ade76 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -529,7 +529,7 @@ if ($compose) {
print C <<EOT;
From $tpl_sender # This line is ignored.
-GIT: Lines beginning in "GIT: " will be removed.
+GIT: Lines beginning in "GIT:" will be removed.
GIT: Consider including an overall diffstat or table of contents
GIT: for the patch you are writing.
GIT:
@@ -562,7 +562,7 @@ EOT
my $in_body = 0;
my $summary_empty = 1;
while(<C>) {
- next if m/^GIT: /;
+ next if m/^GIT:/;
if ($in_body) {
$summary_empty = 0 unless (/^\n$/);
} elsif (/^\n$/) {