undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use new Git::config_path() for aliasesfile

Browse Source 
Signed-off-by: Cord Seele <cowose@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Cord Seele 2011-09-30 12:52:25 +02:00 committed by Junio C Hamano
parent 9fef9e2790
commit cec5dae827
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
git-send-email.perl
View File

@ -225,7 +225,6 @@ my %config_settings = (
"cccmd" => \$cc_cmd, "cccmd" => \$cc_cmd,
"aliasfiletype" => \$aliasfiletype, "aliasfiletype" => \$aliasfiletype,
"bcc" => \@bcclist, "bcc" => \@bcclist,
"aliasesfile" => \@alias_files,
"suppresscc" => \@suppress_cc, "suppresscc" => \@suppress_cc,
"envelopesender" => \$envelope_sender, "envelopesender" => \$envelope_sender,
"multiedit" => \$multiedit, "multiedit" => \$multiedit,
@ -234,6 +233,10 @@ my %config_settings = (
"assume8bitencoding" => \$auto_8bit_encoding, "assume8bitencoding" => \$auto_8bit_encoding,
); );
my %config_path_settings = (
"aliasesfile" => \@alias_files,
);
# Help users prepare for 1.7.0 # Help users prepare for 1.7.0
sub chain_reply_to { sub chain_reply_to {
if (defined $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); $$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) { foreach my $setting (keys %config_settings) {
my $target = $config_settings{$setting}; my $target = $config_settings{$setting};
next if $setting eq "to" and defined $no_to; next if $setting eq "to" and defined $no_to;