use new Git::config_path() for aliasesfile
Signed-off-by: Cord Seele <cowose@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
9fef9e2790
commit
cec5dae827
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user