mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* maint:
  Unquote From line from patch before comparing with given from address.
  git-cherry: Document 'limit' command-line option
This commit is contained in:
Junio C Hamano
2007-06-12 00:15:16 -07:00
parent 1924d64f6e 2cf69cf6ed
commit f26cacf495
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Documentation/git-cherry.txt
View File

@ -53,6 +53,9 @@ OPTIONS
<head>:: <head>::
Working branch; defaults to HEAD. Working branch; defaults to HEAD.
<limit>::
Do not report commits up to (and including) limit.
Author Author
------ ------
Written by Junio C Hamano <junkio@cox.net> Written by Junio C Hamano <junkio@cox.net>

2
GIT-VERSION-GEN
View File

@ -43,3 +43,5 @@ test "$VN" = "$VC" || {
echo >&2 "GIT_VERSION = $VN" echo >&2 "GIT_VERSION = $VN"
echo "GIT_VERSION = $VN" >$GVF echo "GIT_VERSION = $VN" >$GVF
} }

3
git-send-email.perl
View File

@ -561,7 +561,8 @@ foreach my $t (@files) {
$subject = $1; $subject = $1;
} elsif (/^(Cc|From):\s+(.*)$/) { } elsif (/^(Cc|From):\s+(.*)$/) {
if ($2 eq $from) { if (unquote_rfc2047($2) eq $from) {
$from = $2;
next if ($suppress_from); next if ($suppress_from);
} }
elsif ($1 eq 'From') { elsif ($1 eq 'From') {