Skip to content

Commit cec5dae

Browse files
cowosegitster
authored andcommitted
use new Git::config_path() for aliasesfile
Signed-off-by: Cord Seele <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 9fef9e2 commit cec5dae

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

git-send-email.perl

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,6 @@ sub do_edit {
225225
"cccmd" => \$cc_cmd,
226226
"aliasfiletype" => \$aliasfiletype,
227227
"bcc" => \@bcclist,
228-
"aliasesfile" => \@alias_files,
229228
"suppresscc" => \@suppress_cc,
230229
"envelopesender" => \$envelope_sender,
231230
"multiedit" => \$multiedit,
@@ -234,6 +233,10 @@ sub do_edit {
234233
"assume8bitencoding" => \$auto_8bit_encoding,
235234
);
236235

236+
my %config_path_settings = (
237+
"aliasesfile" => \@alias_files,
238+
);
239+
237240
# Help users prepare for 1.7.0
238241
sub chain_reply_to {
239242
if (defined $chain_reply_to &&
@@ -330,6 +333,11 @@ sub read_config {
330333
$$target = Git::config_bool(@repo, "$prefix.$setting") unless (defined $$target);
331334
}
332335

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+
333341
foreach my $setting (keys %config_settings) {
334342
my $target = $config_settings{$setting};
335343
next if $setting eq "to" and defined $no_to;

0 commit comments

Comments
 (0)