From: Junio C Hamano Date: Tue, 12 Jun 2007 07:15:16 +0000 (-0700) Subject: Merge branch 'maint' X-Git-Tag: v1.5.3-rc0~116 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f26cacf4956b08238868b21a8eac6b5e51a17d7f;hp=1924d64f6e070edf1ad1949bf2eb95d4d2451f30;p=git.git Merge branch 'maint' * maint: Unquote From line from patch before comparing with given from address. git-cherry: Document 'limit' command-line option --- diff --git a/Documentation/git-cherry.txt b/Documentation/git-cherry.txt index b62c97097..e6943822c 100644 --- a/Documentation/git-cherry.txt +++ b/Documentation/git-cherry.txt @@ -53,6 +53,9 @@ OPTIONS :: Working branch; defaults to HEAD. +:: + Do not report commits up to (and including) limit. + Author ------ Written by Junio C Hamano diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 289c8067b..06c360b26 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -43,3 +43,5 @@ test "$VN" = "$VC" || { echo >&2 "GIT_VERSION = $VN" echo "GIT_VERSION = $VN" >$GVF } + + diff --git a/git-send-email.perl b/git-send-email.perl index eb876f88d..7c0c90bd2 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -561,7 +561,8 @@ foreach my $t (@files) { $subject = $1; } elsif (/^(Cc|From):\s+(.*)$/) { - if ($2 eq $from) { + if (unquote_rfc2047($2) eq $from) { + $from = $2; next if ($suppress_from); } elsif ($1 eq 'From') {