use new Git::config_path() for aliasesfile
Signed-off-by: Cord Seele <cowose@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Cord Seele committed
Sep 30, 2011 at 12:52 UTC
cec5dae827f2255578807be6214ece1e0619b8e1
1 file changed
+9
-1
git-send-email.perl
+9
-1
@@ -225,7 +225,6 @@ my %config_settings = (
225
"cccmd" => \$cc_cmd,
226
"aliasfiletype" => \$aliasfiletype,
227
"bcc" => \@bcclist,
228
- "aliasesfile" => \@alias_files,
228
"suppresscc" => \@suppress_cc,
229
"envelopesender" => \$envelope_sender,
230
"multiedit" => \$multiedit,
@@ -234,6 +233,10 @@ my %config_settings = (
233
"assume8bitencoding" => \$auto_8bit_encoding,
234
);
235
236
+my %config_path_settings = (
237
+ "aliasesfile" => \@alias_files,
238
+);
239
+
240
# Help users prepare for 1.7.0
241
sub chain_reply_to {
242
if (defined $chain_reply_to &&
@@ -330,6 +333,11 @@ sub read_config {
333
$$target = Git::config_bool(@repo, "$prefix.$setting") unless (defined $$target);
334
}
335
336
+ foreach my $setting (keys %config_path_settings) {
337
+ my $target = $config_path_settings{$setting}->[0];
338
+ $$target = Git::config_path(@repo, "$prefix.$setting") unless (defined $$target);
339
+ }
340
+
341
foreach my $setting (keys %config_settings) {
342
my $target = $config_settings{$setting};
343
next if $setting eq "to" and defined $no_to;