Merge branch 'nd/document-err-packet'

diff --git a/git-send-email.perl b/git-send-email.perl
index 8ded7f5ce3556acf69a2d88e8b9aedae1d5e2da6..91607c5878953d69a8e32731023b2eb727bcc069 100755 (executable)
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -225,7 +225,6 @@ sub do_edit {
     "cccmd" => \$cc_cmd,
     "aliasfiletype" => \$aliasfiletype,
     "bcc" => \@bcclist,
-    "aliasesfile" => \@alias_files,
     "suppresscc" => \@suppress_cc,
     "envelopesender" => \$envelope_sender,
     "multiedit" => \$multiedit,
@@ -234,6 +233,10 @@ sub do_edit {
     "assume8bitencoding" => \$auto_8bit_encoding,
 );
 
+my %config_path_settings = (
+    "aliasesfile" => \@alias_files,
+);
+
 # Help users prepare for 1.7.0
 sub chain_reply_to {
        if (defined $chain_reply_to &&
@@ -333,6 +336,11 @@ sub read_config {
                $$target = Git::config_bool(@repo, "$prefix.$setting") unless (defined $$target);
        }
 
+       foreach my $setting (keys %config_path_settings) {
+               my $target = $config_path_settings{$setting}->[0];
+               $$target = Git::config_path(@repo, "$prefix.$setting") unless (defined $$target);
+       }
+
        foreach my $setting (keys %config_settings) {
                my $target = $config_settings{$setting};
                next if $setting eq "to" and defined $no_to;