From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 20 Dec 2008 03:32:29 +0000 (-0800)
Subject: Merge branch 'maint' to sync with GIT 1.6.0.6
X-Git-Tag: v1.6.1-rc4~16
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=efe05b019ca19328d27c07ef32b4698a7f36166f;p=git.git

Merge branch 'maint' to sync with GIT 1.6.0.6

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

efe05b019ca19328d27c07ef32b4698a7f36166f
diff --cc Documentation/git.txt
index 585af7a0d,df420aeb3..2c0c23003
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@@ -43,19 -43,16 +43,21 @@@ unreleased) version of git, that is ava
  branch of the `git.git` repository.
  Documentation for older releases are available here:
  
- * link:v1.6.0.5/git.html[documentation for release 1.6.0.5]
 -* link:v1.6.0.2/git.html[documentation for release 1.6.0.2]
++* link:v1.6.0.6/git.html[documentation for release 1.6.0.6]
  
  * release notes for
++  link:RelNotes-1.6.0.6.txt[1.6.0.6],
 +  link:RelNotes-1.6.0.5.txt[1.6.0.5],
 +  link:RelNotes-1.6.0.4.txt[1.6.0.4],
 +  link:RelNotes-1.6.0.3.txt[1.6.0.3],
    link:RelNotes-1.6.0.2.txt[1.6.0.2],
    link:RelNotes-1.6.0.1.txt[1.6.0.1],
    link:RelNotes-1.6.0.txt[1.6.0].
  
--* link:v1.5.6.5/git.html[documentation for release 1.5.6.5]
++* link:v1.5.6.6/git.html[documentation for release 1.5.6.6]
  
  * release notes for
++  link:RelNotes-1.5.6.6.txt[1.5.6.6],
    link:RelNotes-1.5.6.5.txt[1.5.6.5],
    link:RelNotes-1.5.6.4.txt[1.5.6.4],
    link:RelNotes-1.5.6.3.txt[1.5.6.3],
@@@ -63,18 -60,18 +65,22 @@@
    link:RelNotes-1.5.6.1.txt[1.5.6.1],
    link:RelNotes-1.5.6.txt[1.5.6].
  
--* link:v1.5.5.4/git.html[documentation for release 1.5.5.4]
++* link:v1.5.5.6/git.html[documentation for release 1.5.5.6]
  
  * release notes for
++  link:RelNotes-1.5.5.6.txt[1.5.5.6],
++  link:RelNotes-1.5.5.5.txt[1.5.5.5],
    link:RelNotes-1.5.5.4.txt[1.5.5.4],
    link:RelNotes-1.5.5.3.txt[1.5.5.3],
    link:RelNotes-1.5.5.2.txt[1.5.5.2],
    link:RelNotes-1.5.5.1.txt[1.5.5.1],
    link:RelNotes-1.5.5.txt[1.5.5].
  
--* link:v1.5.4.5/git.html[documentation for release 1.5.4.5]
++* link:v1.5.4.7/git.html[documentation for release 1.5.4.7]
  
  * release notes for
++  link:RelNotes-1.5.4.7.txt[1.5.4.7],
++  link:RelNotes-1.5.4.6.txt[1.5.4.6],
    link:RelNotes-1.5.4.5.txt[1.5.4.5],
    link:RelNotes-1.5.4.4.txt[1.5.4.4],
    link:RelNotes-1.5.4.3.txt[1.5.4.3],
diff --cc git-send-email.perl
index 3112f769c,449d938ba..61144011d
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@@ -20,14 -20,11 +20,15 @@@ use strict
  use warnings;
  use Term::ReadLine;
  use Getopt::Long;
+ use Text::ParseWords;
  use Data::Dumper;
  use Term::ANSIColor;
 +use File::Temp qw/ tempdir /;
 +use Error qw(:try);
  use Git;
  
 +Getopt::Long::Configure qw/ pass_through /;
 +
  package FakeTerm;
  sub new {
  	my ($class, $reason) = @_;
@@@ -374,13 -383,10 +379,13 @@@ my %parse_alias = 
  			# spaces delimit multiple addresses
  			$aliases{$1} = [ split(/\s+/, $2) ];
  		}}},
 -	pine => sub { my $fh = shift; while (<$fh>) {
 -		if (/^(\S+)\t.*\t(.*)$/) {
 +	pine => sub { my $fh = shift; my $f='\t[^\t]*';
 +	        for (my $x = ''; defined($x); $x = $_) {
 +			chomp $x;
 +		        $x .= $1 while(defined($_ = <$fh>) && /^ +(.*)$/);
 +			$x =~ /^(\S+)$f\t\(?([^\t]+?)\)?(:?$f){0,2}$/ or next;
- 			$aliases{$1} = [ split(/\s*,\s*/, $2) ];
+ 			$aliases{$1} = [ split_addrs($2) ];
 -		}}},
 +		}},
  	gnus => sub { my $fh = shift; while (<$fh>) {
  		if (/\(define-mail-alias\s+"(\S+?)"\s+"(\S+?)"\)/) {
  			$aliases{$1} = [ $2 ];