summaryrefslogtreecommitdiff
path: root/git-send-email.perl
diff options
context:
space:
mode:
authorCord Seele <cowose@googlemail.com>2011-09-30 12:52:25 +0200
committerJunio C Hamano <gitster@pobox.com>2011-09-30 12:35:00 -0700
commitcec5dae827f2255578807be6214ece1e0619b8e1 (patch)
treec0b7b9c449f95ffed3ae4ab250b8286a92c9da35 /git-send-email.perl
parent9fef9e279055423363e110b7246a9b8bbcf0bd72 (diff)
downloadgit-cec5dae827f2255578807be6214ece1e0619b8e1.tar.gz
use new Git::config_path() for aliasesfilecs/perl-config-path-send-email
Signed-off-by: Cord Seele <cowose@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-send-email.perl')
-rwxr-xr-xgit-send-email.perl10
1 files changed, 9 insertions, 1 deletions
diff --git a/git-send-email.perl b/git-send-email.perl
index 98ab33aae7..f17f7b3995 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -225,7 +225,6 @@ my %config_settings = (
"cccmd" => \$cc_cmd,
"aliasfiletype" => \$aliasfiletype,
"bcc" => \@bcclist,
- "aliasesfile" => \@alias_files,
"suppresscc" => \@suppress_cc,
"envelopesender" => \$envelope_sender,
"multiedit" => \$multiedit,
@@ -234,6 +233,10 @@ my %config_settings = (
"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 &&
@@ -330,6 +333,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;