Commit bcde44ed authored by Joe Perches's avatar Joe Perches Committed by Linus Torvalds

scripts/get_maintainer.pl: use .get_maintainer.conf from . then $HOME then scripts

On Mon, 2010-09-13 at 00:01 -0400, Valdis.Kletnieks@vt.edu wrote:
> Any chance of getting that to be ~/.get_maintainer.conf rather than
> ./.get_maintainer.conf? I've just gotten bit like the 3rd or 4th time by
> "oh but you didn't create that file in *this* tree"
> (I usually have a linus git tree, a linux-next tree, and 3-4 -mm trees)

Sure.

Add a search path for the .conf file.

3 paths are added:

.             customized per-tree configurations
$HOME         user global configuration when per-tree configs don't exist
./scripts     lk defaults to override script
Signed-off-by: default avatarJoe Perches <joe@perches.com>
Cc: Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e3e9d114
...@@ -110,10 +110,12 @@ my %VCS_cmds_hg = ( ...@@ -110,10 +110,12 @@ my %VCS_cmds_hg = (
"blame_commit_pattern" => "^([0-9a-f]+):" "blame_commit_pattern" => "^([0-9a-f]+):"
); );
if (-f "${lk_path}.get_maintainer.conf") { my $conf = which_conf(".get_maintainer.conf");
if (-f $conf) {
my @conf_args; my @conf_args;
open(my $conffile, '<', "${lk_path}.get_maintainer.conf") open(my $conffile, '<', "$conf")
or warn "$P: Can't open .get_maintainer.conf: $!\n"; or warn "$P: Can't find a readable .get_maintainer.conf file $!\n";
while (<$conffile>) { while (<$conffile>) {
my $line = $_; my $line = $_;
...@@ -961,6 +963,18 @@ sub which { ...@@ -961,6 +963,18 @@ sub which {
return ""; return "";
} }
sub which_conf {
my ($conf) = @_;
foreach my $path (split(/:/, ".:$ENV{HOME}:.scripts")) {
if (-e "$path/$conf") {
return "$path/$conf";
}
}
return "";
}
sub mailmap { sub mailmap {
my (@lines) = @_; my (@lines) = @_;
my %hash; my %hash;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment