summaryrefslogtreecommitdiff
path: root/git-send-email.perl
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-09-12 13:07:20 -0700
committerJunio C Hamano <gitster@pobox.com>2007-09-12 13:07:20 -0700
commit88b7dd4597b11db4a99537519df91265fc7533e0 (patch)
treeab659a9c6037c35e328d81511718de1edd12d9f1 /git-send-email.perl
parenta2f22dbfa3a1039e5c6a9968d2421f1e9716515a (diff)
parent3d80017d0c948cca251a7aaa9fdc84a0664e95fe (diff)
downloadgit-88b7dd4597b11db4a99537519df91265fc7533e0.tar.gz
Merge branch 'maint'
* maint: stash: end index commit log with a newline git-commit: Disallow amend if it is going to produce an empty non-merge commit git-send-email.perl: Add angle brackets to In-Reply-To if necessary Fix a test failure (t9500-*.sh) on cygwin
Diffstat (limited to 'git-send-email.perl')
-rwxr-xr-xgit-send-email.perl3
1 files changed, 2 insertions, 1 deletions
diff --git a/git-send-email.perl b/git-send-email.perl
index dd7560b180..d8319d45fb 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -361,7 +361,8 @@ if ($thread && !defined $initial_reply_to && $prompting) {
} while (!defined $_);
$initial_reply_to = $_;
- $initial_reply_to =~ s/(^\s+|\s+$)//g;
+ $initial_reply_to =~ s/^\s+<?/</;
+ $initial_reply_to =~ s/>?\s+$/>/;
}
if (!defined $smtp_server) {