From 6894f49f7bd52da77a3f4ba7fc52d44046f419ac Mon Sep 17 00:00:00 2001 From: "Luiz Fernando N. Capitulino" Date: Mon, 11 Jun 2007 09:56:56 -0300 Subject: git-cherry: Document 'limit' command-line option Signed-off-by: Luiz Fernando N. Capitulino Signed-off-by: Junio C Hamano --- Documentation/git-cherry.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Documentation/git-cherry.txt b/Documentation/git-cherry.txt index 27b67b81a5..8c7d9670d3 100644 --- a/Documentation/git-cherry.txt +++ b/Documentation/git-cherry.txt @@ -53,6 +53,9 @@ OPTIONS :: Working branch; defaults to HEAD. +:: + Do not report commits up to (and including) limit. + Author ------ Written by Junio C Hamano -- cgit v1.2.1 From 2cf69cf6edbaa15ed47f9c73c0eb60ce7983ba6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= Date: Mon, 11 Jun 2007 13:04:40 -0400 Subject: Unquote From line from patch before comparing with given from address. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This makes --suppress-from actually work when you're unfortunate enough to have non-ASCII in your name. Also, if there's a match use the optionally RFC2047 quoted version from the email. Signed-off-by: Kristian Høgsberg Signed-off-by: Junio C Hamano --- git-send-email.perl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/git-send-email.perl b/git-send-email.perl index eb876f88dd..7c0c90bd21 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -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') { -- cgit v1.2.1