summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-06-12 07:15:16 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-06-12 07:15:16 (GMT)
commitf26cacf4956b08238868b21a8eac6b5e51a17d7f (patch)
treef49648b98ced25a8ca0162888c6b336231f75e3d
parent1924d64f6e070edf1ad1949bf2eb95d4d2451f30 (diff)
parent2cf69cf6edbaa15ed47f9c73c0eb60ce7983ba6b (diff)
downloadgit-f26cacf4956b08238868b21a8eac6b5e51a17d7f.zip
git-f26cacf4956b08238868b21a8eac6b5e51a17d7f.tar.gz
git-f26cacf4956b08238868b21a8eac6b5e51a17d7f.tar.bz2
Merge branch 'maint'
* maint: Unquote From line from patch before comparing with given from address. git-cherry: Document 'limit' command-line option
-rw-r--r--Documentation/git-cherry.txt3
-rwxr-xr-xGIT-VERSION-GEN2
-rwxr-xr-xgit-send-email.perl3
3 files changed, 7 insertions, 1 deletions
diff --git a/Documentation/git-cherry.txt b/Documentation/git-cherry.txt
index b62c970..e694382 100644
--- 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 289c806..06c360b 100755
--- 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 eb876f8..7c0c90b 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') {