scripts/get_maintainer.pl: correct indentation in a few places

And a miscellaneous conversion of You to you in a help message Signed-off-by: Joe Perches <joe@perches.com> Cc: Florian Mickler <florian@mickler.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

scripts/get_maintainer.pl: correct indentation in a few places
And a miscellaneous conversion of You to you in a help message Signed-off-by: Joe Perches <joe@perches.com> Cc: Florian Mickler <florian@mickler.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Joe Perches · Linus Torvalds
1 parent 7fa8ff2e0c
Showing 1 changed file with 78 additions and 78 deletions Side-by-side Diff
scripts/get_maintainer.pl
@@ -306,7 +306,7 @@
     my $mailmap = {
 	names => {},
 	addresses => {}
-   };
+    };
  
     if (!$email_remove_duplicates) {
 	return $mailmap;
  
  
  
  
  
  
  
  
  
@@ -327,39 +327,39 @@
 	# name1 <mail1> name2 <mail2>
 	# (see man git-shortlog)
 	if (/^(.+)<(.+)>$/) {
-		my $real_name = $1;
-		my $address = $2;
+	    my $real_name = $1;
+	    my $address = $2;
  
-		$real_name =~ s/\s+$//;
-		$mailmap->{names}->{$address} = $real_name;
+	    $real_name =~ s/\s+$//;
+	    $mailmap->{names}->{$address} = $real_name;
  
 	} elsif (/^<([^\s]+)>\s*<([^\s]+)>$/) {
-		my $real_address = $1;
-		my $wrong_address = $2;
+	    my $real_address = $1;
+	    my $wrong_address = $2;
  
-		$mailmap->{addresses}->{$wrong_address} = $real_address;
+	    $mailmap->{addresses}->{$wrong_address} = $real_address;
  
 	} elsif (/^(.+)<([^\s]+)>\s*<([^\s]+)>$/) {
-		my $real_name= $1;
-		my $real_address = $2;
-		my $wrong_address = $3;
+	    my $real_name= $1;
+	    my $real_address = $2;
+	    my $wrong_address = $3;
  
-		$real_name =~ s/\s+$//;
+	    $real_name =~ s/\s+$//;
  
-		$mailmap->{names}->{$wrong_address} = $real_name;
-		$mailmap->{addresses}->{$wrong_address} = $real_address;
+	    $mailmap->{names}->{$wrong_address} = $real_name;
+	    $mailmap->{addresses}->{$wrong_address} = $real_address;
  
 	} elsif (/^(.+)<([^\s]+)>\s*([^\s].*)<([^\s]+)>$/) {
-		my $real_name = $1;
-		my $real_address = $2;
-		my $wrong_name = $3;
-		my $wrong_address = $4;
+	    my $real_name = $1;
+	    my $real_address = $2;
+	    my $wrong_name = $3;
+	    my $wrong_address = $4;
  
-		$real_name =~ s/\s+$//;
-		$wrong_name =~ s/\s+$//;
+	    $real_name =~ s/\s+$//;
+	    $wrong_name =~ s/\s+$//;
  
-		$mailmap->{names}->{format_email($wrong_name,$wrong_address,1)} = $real_name;
-		$mailmap->{addresses}->{format_email($wrong_name,$wrong_address,1)} = $real_address;
+	    $mailmap->{names}->{format_email($wrong_name,$wrong_address,1)} = $real_name;
+	    $mailmap->{addresses}->{format_email($wrong_name,$wrong_address,1)} = $real_address;
 	}
     }
     close($mailmap_file);
  
@@ -743,30 +743,30 @@
 }
  
 sub top_of_kernel_tree {
-	my ($lk_path) = @_;
+    my ($lk_path) = @_;
  
-	if ($lk_path ne "" && substr($lk_path,length($lk_path)-1,1) ne "/") {
-	    $lk_path .= "/";
-	}
-	if (   (-f "${lk_path}COPYING")
-	    && (-f "${lk_path}CREDITS")
-	    && (-f "${lk_path}Kbuild")
-	    && (-f "${lk_path}MAINTAINERS")
-	    && (-f "${lk_path}Makefile")
-	    && (-f "${lk_path}README")
-	    && (-d "${lk_path}Documentation")
-	    && (-d "${lk_path}arch")
-	    && (-d "${lk_path}include")
-	    && (-d "${lk_path}drivers")
-	    && (-d "${lk_path}fs")
-	    && (-d "${lk_path}init")
-	    && (-d "${lk_path}ipc")
-	    && (-d "${lk_path}kernel")
-	    && (-d "${lk_path}lib")
-	    && (-d "${lk_path}scripts")) {
-		return 1;
-	}
-	return 0;
+    if ($lk_path ne "" && substr($lk_path,length($lk_path)-1,1) ne "/") {
+	$lk_path .= "/";
+    }
+    if (   (-f "${lk_path}COPYING")
+	&& (-f "${lk_path}CREDITS")
+	&& (-f "${lk_path}Kbuild")
+	&& (-f "${lk_path}MAINTAINERS")
+	&& (-f "${lk_path}Makefile")
+	&& (-f "${lk_path}README")
+	&& (-d "${lk_path}Documentation")
+	&& (-d "${lk_path}arch")
+	&& (-d "${lk_path}include")
+	&& (-d "${lk_path}drivers")
+	&& (-d "${lk_path}fs")
+	&& (-d "${lk_path}init")
+	&& (-d "${lk_path}ipc")
+	&& (-d "${lk_path}kernel")
+	&& (-d "${lk_path}lib")
+	&& (-d "${lk_path}scripts")) {
+	return 1;
+    }
+    return 0;
 }
  
 sub parse_email {
  
  
  
@@ -1107,29 +1107,30 @@
 }
  
 sub mailmap_email {
-	my $line = shift;
+    my $line = shift;
  
-	my ($name, $address) = parse_email($line);
-	my $email = format_email($name, $address, 1);
-	my $real_name = $name;
-	my $real_address = $address;
+    my ($name, $address) = parse_email($line);
+    my $email = format_email($name, $address, 1);
+    my $real_name = $name;
+    my $real_address = $address;
  
-	if (exists $mailmap->{names}->{$email} || exists $mailmap->{addresses}->{$email}) {
-		if (exists $mailmap->{names}->{$email}) {
-			$real_name = $mailmap->{names}->{$email};
-		}
-		if (exists $mailmap->{addresses}->{$email}) {
-			$real_address = $mailmap->{addresses}->{$email};
-		}
-	} else {
-		if (exists $mailmap->{names}->{$address}) {
-			$real_name = $mailmap->{names}->{$address};
-		}
-		if (exists $mailmap->{addresses}->{$address}) {
-			$real_address = $mailmap->{addresses}->{$address};
-		}
+    if (exists $mailmap->{names}->{$email} ||
+	exists $mailmap->{addresses}->{$email}) {
+	if (exists $mailmap->{names}->{$email}) {
+	    $real_name = $mailmap->{names}->{$email};
 	}
-	return format_email($real_name, $real_address, 1);
+	if (exists $mailmap->{addresses}->{$email}) {
+	    $real_address = $mailmap->{addresses}->{$email};
+	}
+    } else {
+	if (exists $mailmap->{names}->{$address}) {
+	    $real_name = $mailmap->{names}->{$address};
+	}
+	if (exists $mailmap->{addresses}->{$address}) {
+	    $real_address = $mailmap->{addresses}->{$address};
+	}
+    }
+    return format_email($real_name, $real_address, 1);
 }
  
 sub mailmap {
  
@@ -1146,18 +1147,17 @@
 }
  
 sub merge_by_realname {
-	my %address_map;
-	my (@emails) = @_;
-	foreach my $email (@emails) {
-		my ($name, $address) = parse_email($email);
-		if (!exists $address_map{$name}) {
-			$address_map{$name} = $address;
-		} else {
-			$address = $address_map{$name};
-			$email = format_email($name,$address,1);
-		}
+    my %address_map;
+    my (@emails) = @_;
+    foreach my $email (@emails) {
+	my ($name, $address) = parse_email($email);
+	if (!exists $address_map{$name}) {
+	    $address_map{$name} = $address;
+	} else {
+	    $address = $address_map{$name};
+	    $email = format_email($name,$address,1);
 	}
-
+    }
 }
  
 sub git_execute_cmd {
@@ -1555,7 +1555,7 @@
  
 Any *'d entry is selected.
  
-If you have git or hg installed, You can choose to summarize the commit
+If you have git or hg installed, you can choose to summarize the commit
 history of files in the patch.  Also, each line of the current file can
 be matched to its commit author and that commits signers with blame.
...	...	@@ -306,7 +306,7 @@
306	306	my $mailmap = {
307	307	names => {},
308	308	addresses => {}
309		- };
	309	+ };
310	310
311	311	if (!$email_remove_duplicates) {
312	312	return $mailmap;
313	313
314	314
315	315
316	316
317	317
318	318
319	319
320	320
321	321
...	...	@@ -327,39 +327,39 @@
327	327	# name1 <mail1> name2 <mail2>
328	328	# (see man git-shortlog)
329	329	if (/^(.+)<(.+)>$/) {
330		- my $real_name = $1;
331		- my $address = $2;
	330	+ my $real_name = $1;
	331	+ my $address = $2;
332	332
333		- $real_name =~ s/\s+$//;
334		- $mailmap->{names}->{$address} = $real_name;
	333	+ $real_name =~ s/\s+$//;
	334	+ $mailmap->{names}->{$address} = $real_name;
335	335
336	336	} elsif (/^<([^\s]+)>\s*<([^\s]+)>$/) {
337		- my $real_address = $1;
338		- my $wrong_address = $2;
	337	+ my $real_address = $1;
	338	+ my $wrong_address = $2;
339	339
340		- $mailmap->{addresses}->{$wrong_address} = $real_address;
	340	+ $mailmap->{addresses}->{$wrong_address} = $real_address;
341	341
342	342	} elsif (/^(.+)<([^\s]+)>\s*<([^\s]+)>$/) {
343		- my $real_name= $1;
344		- my $real_address = $2;
345		- my $wrong_address = $3;
	343	+ my $real_name= $1;
	344	+ my $real_address = $2;
	345	+ my $wrong_address = $3;
346	346
347		- $real_name =~ s/\s+$//;
	347	+ $real_name =~ s/\s+$//;
348	348
349		- $mailmap->{names}->{$wrong_address} = $real_name;
350		- $mailmap->{addresses}->{$wrong_address} = $real_address;
	349	+ $mailmap->{names}->{$wrong_address} = $real_name;
	350	+ $mailmap->{addresses}->{$wrong_address} = $real_address;
351	351
352	352	} elsif (/^(.+)<([^\s]+)>\s([^\s].)<([^\s]+)>$/) {
353		- my $real_name = $1;
354		- my $real_address = $2;
355		- my $wrong_name = $3;
356		- my $wrong_address = $4;
	353	+ my $real_name = $1;
	354	+ my $real_address = $2;
	355	+ my $wrong_name = $3;
	356	+ my $wrong_address = $4;
357	357
358		- $real_name =~ s/\s+$//;
359		- $wrong_name =~ s/\s+$//;
	358	+ $real_name =~ s/\s+$//;
	359	+ $wrong_name =~ s/\s+$//;
360	360
361		- $mailmap->{names}->{format_email($wrong_name,$wrong_address,1)} = $real_name;
362		- $mailmap->{addresses}->{format_email($wrong_name,$wrong_address,1)} = $real_address;
	361	+ $mailmap->{names}->{format_email($wrong_name,$wrong_address,1)} = $real_name;
	362	+ $mailmap->{addresses}->{format_email($wrong_name,$wrong_address,1)} = $real_address;
363	363	}
364	364	}
365	365	close($mailmap_file);
366	366
...	...	@@ -743,30 +743,30 @@
743	743	}
744	744
745	745	sub top_of_kernel_tree {
746		- my ($lk_path) = @_;
	746	+ my ($lk_path) = @_;
747	747
748		- if ($lk_path ne "" && substr($lk_path,length($lk_path)-1,1) ne "/") {
749		- $lk_path .= "/";
750		- }
751		- if ( (-f "${lk_path}COPYING")
752		- && (-f "${lk_path}CREDITS")
753		- && (-f "${lk_path}Kbuild")
754		- && (-f "${lk_path}MAINTAINERS")
755		- && (-f "${lk_path}Makefile")
756		- && (-f "${lk_path}README")
757		- && (-d "${lk_path}Documentation")
758		- && (-d "${lk_path}arch")
759		- && (-d "${lk_path}include")
760		- && (-d "${lk_path}drivers")
761		- && (-d "${lk_path}fs")
762		- && (-d "${lk_path}init")
763		- && (-d "${lk_path}ipc")
764		- && (-d "${lk_path}kernel")
765		- && (-d "${lk_path}lib")
766		- && (-d "${lk_path}scripts")) {
767		- return 1;
768		- }
769		- return 0;
	748	+ if ($lk_path ne "" && substr($lk_path,length($lk_path)-1,1) ne "/") {
	749	+ $lk_path .= "/";
	750	+ }
	751	+ if ( (-f "${lk_path}COPYING")
	752	+ && (-f "${lk_path}CREDITS")
	753	+ && (-f "${lk_path}Kbuild")
	754	+ && (-f "${lk_path}MAINTAINERS")
	755	+ && (-f "${lk_path}Makefile")
	756	+ && (-f "${lk_path}README")
	757	+ && (-d "${lk_path}Documentation")
	758	+ && (-d "${lk_path}arch")
	759	+ && (-d "${lk_path}include")
	760	+ && (-d "${lk_path}drivers")
	761	+ && (-d "${lk_path}fs")
	762	+ && (-d "${lk_path}init")
	763	+ && (-d "${lk_path}ipc")
	764	+ && (-d "${lk_path}kernel")
	765	+ && (-d "${lk_path}lib")
	766	+ && (-d "${lk_path}scripts")) {
	767	+ return 1;
	768	+ }
	769	+ return 0;
770	770	}
771	771
772	772	sub parse_email {
773	773
774	774
775	775
...	...	@@ -1107,29 +1107,30 @@
1107	1107	}
1108	1108
1109	1109	sub mailmap_email {
1110		- my $line = shift;
	1110	+ my $line = shift;
1111	1111
1112		- my ($name, $address) = parse_email($line);
1113		- my $email = format_email($name, $address, 1);
1114		- my $real_name = $name;
1115		- my $real_address = $address;
	1112	+ my ($name, $address) = parse_email($line);
	1113	+ my $email = format_email($name, $address, 1);
	1114	+ my $real_name = $name;
	1115	+ my $real_address = $address;
1116	1116
1117		- if (exists $mailmap->{names}->{$email} \|\| exists $mailmap->{addresses}->{$email}) {
1118		- if (exists $mailmap->{names}->{$email}) {
1119		- $real_name = $mailmap->{names}->{$email};
1120		- }
1121		- if (exists $mailmap->{addresses}->{$email}) {
1122		- $real_address = $mailmap->{addresses}->{$email};
1123		- }
1124		- } else {
1125		- if (exists $mailmap->{names}->{$address}) {
1126		- $real_name = $mailmap->{names}->{$address};
1127		- }
1128		- if (exists $mailmap->{addresses}->{$address}) {
1129		- $real_address = $mailmap->{addresses}->{$address};
1130		- }
	1117	+ if (exists $mailmap->{names}->{$email} \|\|
	1118	+ exists $mailmap->{addresses}->{$email}) {
	1119	+ if (exists $mailmap->{names}->{$email}) {
	1120	+ $real_name = $mailmap->{names}->{$email};
1131	1121	}
1132		- return format_email($real_name, $real_address, 1);
	1122	+ if (exists $mailmap->{addresses}->{$email}) {
	1123	+ $real_address = $mailmap->{addresses}->{$email};
	1124	+ }
	1125	+ } else {
	1126	+ if (exists $mailmap->{names}->{$address}) {
	1127	+ $real_name = $mailmap->{names}->{$address};
	1128	+ }
	1129	+ if (exists $mailmap->{addresses}->{$address}) {
	1130	+ $real_address = $mailmap->{addresses}->{$address};
	1131	+ }
	1132	+ }
	1133	+ return format_email($real_name, $real_address, 1);
1133	1134	}
1134	1135
1135	1136	sub mailmap {
1136	1137
...	...	@@ -1146,18 +1147,17 @@
1146	1147	}
1147	1148
1148	1149	sub merge_by_realname {
1149		- my %address_map;
1150		- my (@emails) = @_;
1151		- foreach my $email (@emails) {
1152		- my ($name, $address) = parse_email($email);
1153		- if (!exists $address_map{$name}) {
1154		- $address_map{$name} = $address;
1155		- } else {
1156		- $address = $address_map{$name};
1157		- $email = format_email($name,$address,1);
1158		- }
	1150	+ my %address_map;
	1151	+ my (@emails) = @_;
	1152	+ foreach my $email (@emails) {
	1153	+ my ($name, $address) = parse_email($email);
	1154	+ if (!exists $address_map{$name}) {
	1155	+ $address_map{$name} = $address;
	1156	+ } else {
	1157	+ $address = $address_map{$name};
	1158	+ $email = format_email($name,$address,1);
1159	1159	}
1160		-
	1160	+ }
1161	1161	}
1162	1162
1163	1163	sub git_execute_cmd {
...	...	@@ -1555,7 +1555,7 @@
1555	1555
1556	1556	Any *'d entry is selected.
1557	1557
1558		-If you have git or hg installed, You can choose to summarize the commit
	1558	+If you have git or hg installed, you can choose to summarize the commit
1559	1559	history of files in the patch. Also, each line of the current file can
1560	1560	be matched to its commit author and that commits signers with blame.
1561	1561