aboutsummaryrefslogtreecommitdiff
path: root/git-send-email.perl
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-07-25 13:56:36 -0700
committerJunio C Hamano <gitster@pobox.com>2008-07-25 13:56:36 -0700
commitd9d9e6ee6366fed93a4beff3994bad376f81eabd (patch)
treebd666fa15e440aaa1d12e2092489cd20770111f8 /git-send-email.perl
parentc921cc92e5ff2ead4dea112b19e555f521cf20b8 (diff)
parentbfce5087ee01fdead5cdc52180c8eef22adbbd71 (diff)
downloadgit-d9d9e6ee6366fed93a4beff3994bad376f81eabd.tar.gz
git-d9d9e6ee6366fed93a4beff3994bad376f81eabd.tar.xz
Merge branch 'maint'
* maint: Makefile: fix shell quoting tests: propagate $(TAR) down from the toplevel Makefile index-pack.c: correctly initialize appended objects send-email: find body-encoding correctly
Diffstat (limited to 'git-send-email.perl')
-rwxr-xr-xgit-send-email.perl2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-send-email.perl b/git-send-email.perl
index 2e4a44ad2..d2fd89907 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -882,7 +882,7 @@ foreach my $t (@files) {
}
elsif (/^Content-type:/i) {
$has_content_type = 1;
- if (/charset="?[^ "]+/) {
+ if (/charset="?([^ "]+)/) {
$body_encoding = $1;
}
push @xh, $_;