hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

checkpatch: allow not using -f with files that are in git 

If a file exists in git and checkpatch is used without the -f flag for
scanning a file, then checkpatch will scan the file assuming it's a patch
and emit:

ERROR: Does not appear to be a unified-diff format patch

Change the behavior to assume the -f flag if the file exists in git.

[joe@perches.com: fix git "fatal" warning if file argument outside kernel tree]
  Link: https://lkml.kernel.org/r/b6afa04112d450c2fc120a308d706acd60cee294.camel@perches.com

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Reviewed-by: Julia Lawall <julia.lawall@inria.fr>
Cc: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Link: https://lkml.kernel.org/r/45b81a48e1568bd0126a96f5046eb7aaae9b83c9.camel@perches.com
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Joe Perches 2020-10-15 20:12:12 -07:00 committed by Linus Torvalds
parent 99ca38c2aa
commit f5f613259f
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
scripts/checkpatch.pl
View File

@ -974,6 +974,16 @@ sub seed_camelcase_includes {
} }
} }
sub git_is_single_file {
my ($filename) = @_;
return 0 if ((which("git") eq "") || !(-e "$gitroot"));
my $output = `${git_command} ls-files -- $filename 2>/dev/null`;
my $count = $output =~ tr/\n//;
return $count eq 1 && $output =~ m{^${filename}$};
}
sub git_commit_info { sub git_commit_info {
my ($commit, $id, $desc) = @_; my ($commit, $id, $desc) = @_;
@ -1047,6 +1057,9 @@ my $vname;
$allow_c99_comments = !defined $ignore_type{"C99_COMMENT_TOLERANCE"}; $allow_c99_comments = !defined $ignore_type{"C99_COMMENT_TOLERANCE"};
for my $filename (@ARGV) { for my $filename (@ARGV) {
my $FILE; my $FILE;
my $is_git_file = git_is_single_file($filename);
my $oldfile = $file;
$file = 1 if ($is_git_file);
if ($git) { if ($git) {
open($FILE, '-|', "git format-patch -M --stdout -1 $filename") || open($FILE, '-|', "git format-patch -M --stdout -1 $filename") ||
die "$P: $filename: git format-patch failed - $!\n"; die "$P: $filename: git format-patch failed - $!\n";
@ -1091,6 +1104,7 @@ for my $filename (@ARGV) {
@modifierListFile = (); @modifierListFile = ();
@typeListFile = (); @typeListFile = ();
build_types(); build_types();
$file = $oldfile if ($is_git_file);
} }
if (!$quiet) { if (!$quiet) {