1 files changed, 41 insertions, 4 deletions

diff --git a/scripts/get_maintainer.pl b/scripts/get_maintainer.pl
index d21ec3a8960..139e0fff8e3 100755
--- a/scripts/get_maintainer.pl
+++ b/scripts/get_maintainer.pl
@@ -13,7 +13,7 @@
 use strict;
 
 my $P = $0;
-my $V = '0.26-beta6';
+my $V = '0.26';
 
 use Getopt::Long qw(:config no_auto_abbrev);
 
@@ -40,7 +40,7 @@ my $email_use_mailmap = 1;
 my $output_multiline = 1;
 my $output_separator = ", ";
 my $output_roles = 0;
-my $output_rolestats = 0;
+my $output_rolestats = 1;
 my $scm = 0;
 my $web = 0;
 my $subsystem = 0;
@@ -494,6 +494,40 @@ if ($web) {
 
 exit($exit);
 
+sub range_is_maintained {
+    my ($start, $end) = @_;
+
+    for (my $i = $start; $i < $end; $i++) {
+        my $line = $typevalue[$i];
+        if ($line =~ m/^(\C):\s*(.*)/) {
+            my $type = $1;
+            my $value = $2;
+            if ($type eq 'S') {
+                if ($value =~ /(maintain|support)/i) {
+                    return 1;
+                }
+            }
+        }
+    }
+    return 0;
+}
+
+sub range_has_maintainer {
+    my ($start, $end) = @_;
+
+    for (my $i = $start; $i < $end; $i++) {
+        my $line = $typevalue[$i];
+        if ($line =~ m/^(\C):\s*(.*)/) {
+            my $type = $1;
+            my $value = $2;
+            if ($type eq 'M') {
+                return 1;
+            }
+        }
+    }
+    return 0;
+}
+
 sub get_maintainers {
     %email_hash_name = ();
     %email_hash_address = ();
@@ -556,7 +590,9 @@ sub get_maintainers {
                                 my $file_pd = ($file  =~ tr@/@@);
                                 $value_pd++ if (substr($value,-1,1) ne "/");
                                 $value_pd = -1 if ($value =~ /^\.\*/);
-                                if ($value_pd >= $file_pd) {
+                                if ($value_pd >= $file_pd &&
+                                    range_is_maintained($start, $end) &&
+                                    range_has_maintainer($start, $end)) {
                                     $exact_pattern_match_hash{$file} = 1;
                                 }
                                 if ($pattern_depth == 0 ||
@@ -720,7 +756,8 @@ Other options:
   --help => show this help information
 
 Default options:
-  [--email --git --m --n --l --multiline --pattern-depth=0 --remove-duplicates]
+  [--email --nogit --git-fallback --m --n --l --multiline -pattern-depth=0
+   --remove-duplicates --rolestats]
 
 Notes:
   Using "-f directory" may give unexpected results: