diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-07-26 00:56:36 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-26 00:56:36 +0400 |
| commit | d9d9e6ee6366fed93a4beff3994bad376f81eabd (patch) | |
| tree | bd666fa15e440aaa1d12e2092489cd20770111f8 /git-send-email.perl | |
| parent | c921cc92e5ff2ead4dea112b19e555f521cf20b8 (diff) | |
| parent | bfce5087ee01fdead5cdc52180c8eef22adbbd71 (diff) | |
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-x | git-send-email.perl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-send-email.perl b/git-send-email.perl index 2e4a44ad29..d2fd899076 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, $_; |