Andrew's git / gitweb.git / diff
?
Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Tue, 12 Jun 2007 07:15:16 +0000 (00:15 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 12 Jun 2007 07:15:16 +0000 (00:15 -0700)
* maint:
Unquote From line from patch before comparing with given from address.
git-cherry: Document 'limit' command-line option

Documentation/git-cherry.txt patch | blob | history
GIT-VERSION-GEN patch | blob | history
git-send-email.perl patch | blob | history
diff --git a/Documentation/git-cherry.txt b/Documentation/git-cherry.txt
index b62c97097f1d66a26767a304a59b83bca7b727ee..e6943822cd1c003d666178ea26f7b24e56ad210f 100644 (file)
--- 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
index 289c8067b507095b18fc7be60772756ff740385d..06c360b267f0d9e459e44ccaa81dd16b4384c627 100755 (executable)
--- 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 eb876f88ddec315991c2634a976eca8e5b99a1ba..7c0c90bd21bbb009de81aa315bed1c947a32c423 100755 (executable)
--- 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') {