checkpatch: disallow --git and --file/--fix (32f30ca9) · Commits · 戴 / test

Don't allow these options to be combined. Miscellanea: o Add missing $P: to some die("reason message") output Signed-off-by:

scripts/checkpatch.pl

+4 −2

Original line number	Diff line number	Diff line
		@@ -246,6 +246,8 @@ list_types(0) if ($list_types);
		$fix = 1 if ($fix_inplace);
		$check_orig = $check;

		die "$P: --git cannot be used with --file or --fix\n" if ($git && ($file \|\| $fix));

		my $exit = 0;

		my $perl_version_ok = 1;
		@@ -269,11 +271,11 @@ if ($color =~ /^[01]$/) {
		} elsif ($color =~ /^auto$/i) {
		$color = (-t STDOUT);
		} else {
		die "Invalid color mode: $color\n";
		die "$P: Invalid color mode: $color\n";
		}

		# skip TAB size 1 to avoid additional checks on $tabsize - 1
		die "Invalid TAB size: $tabsize\n" if ($tabsize < 2);
		die "$P: Invalid TAB size: $tabsize\n" if ($tabsize < 2);

		sub hash_save_array_words {
		my ($hashRef, $arrayRef) = @_;