From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 23 May 2009 08:43:26 +0000 (-0700)
Subject: Merge branch 'tp/send-email-from-config'
X-Git-Tag: v1.6.4-rc0~132
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/212fa1d96040a01054d6bd92ee2bb74fe7071d33?hp=-c

Merge branch 'tp/send-email-from-config'

* tp/send-email-from-config:
send-email: Add config option for sender address
---

212fa1d96040a01054d6bd92ee2bb74fe7071d33
diff --combined git-send-email.perl
index e3408d513f,d9c7f32aa3..e793935b4f
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@@ -210,6 -210,7 +210,7 @@@ my %config_settings = 
      "envelopesender" => \$envelope_sender,
      "multiedit" => \$multiedit,
      "confirm"   => \$confirm,
+     "from" => \$sender,
  );
  
  # Handle Uncouth Termination
@@@ -409,7 -410,7 +410,7 @@@ my %parse_alias = 
  	mailrc => sub { my $fh = shift; while (<$fh>) {
  		if (/^alias\s+(\S+)\s+(.*)$/) {
  			# spaces delimit multiple addresses
 -			$aliases{$1} = [ split(/\s+/, $2) ];
 +			$aliases{$1} = [ quotewords('\s+', 0, $2) ];
  		}}},
  	pine => sub { my $fh = shift; my $f='\t[^\t]*';
  	        for (my $x = ''; defined($x); $x = $_) {