Merge branch 'maint'

* maint: Unquote From line from patch before comparing with given from address. git-cherry: Document 'limit' command-line option
18 years ago · f26cacf495
3 changed files with 7 additions and 1 deletions
--- a/Documentation/git-cherry.txt
+++ b/Documentation/git-cherry.txt
@ -53,6 +53,9 @@ OPTIONS
				@@ -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>
--- a/2
+++ b/2
@ -43,3 +43,5 @@ test "$VN" = "$VC" || {
				@@ -43,3 +43,5 @@ test "$VN" = "$VC" || {
 	echo >&2 "GIT_VERSION = $VN"
 	echo "GIT_VERSION = $VN" >$GVF
 }
+
+
--- a/git-send-email.perl
+++ b/git-send-email.perl
@ -561,7 +561,8 @@ foreach my $t (@files) {
				@@ -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') {