Merge branch 'maint'

gitster · gitster · commit f26cacf4956b · 2007-06-12T00:15:16.000-07:00
* 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
@@ -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>
diff --git 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
@@ -561,7 +561,8 @@ sub send_message
 					$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') {
