Merge branch 'maint'
* maint: Unquote From line from patch before comparing with given from address. git-cherry: Document 'limit' command-line option
This commit is contained in:
commit
f26cacf495
@ -53,6 +53,9 @@ OPTIONS
|
||||
<head>::
|
||||
Working branch; defaults to HEAD.
|
||||
|
||||
<limit>::
|
||||
Do not report commits up to (and including) limit.
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Junio C Hamano <junkio@cox.net>
|
||||
|
@ -43,3 +43,5 @@ test "$VN" = "$VC" || {
|
||||
echo >&2 "GIT_VERSION = $VN"
|
||||
echo "GIT_VERSION = $VN" >$GVF
|
||||
}
|
||||
|
||||
|
||||
|
@ -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') {
|
||||
|
Loading…
Reference in New Issue
Block a user