The patch titled
Subject: checkpatch: fix git "fatal" warning if file argument outside kernel tree
has been removed from the -mm tree. Its filename was
checkpatch-allow-not-using-f-with-files-that-are-in-git-fix.patch
This patch was dropped because it was folded into checkpatch-allow-not-using-f-with-files-that-are-in-git.patch
------------------------------------------------------
From: Joe Perches <joe@xxxxxxxxxxx>
Subject: checkpatch: fix git "fatal" warning if file argument outside kernel tree
commit bcf4271d4bc3 ("checkpatch: allow not using -f with files that are
in git") in linux-next causes checkpatch to emit a fatal message:
fatal: <file>: '<file>' is outside repository at '<kernel_dir>'
Fix that by sending git's error output to /dev/null instead.
Link: https://lkml.kernel.org/r/b6afa04112d450c2fc120a308d706acd60cee294.camel@xxxxxxxxxxx
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Reported-by: Julia Lawall <julia.lawall@xxxxxxxx>
Reviewed-by: Julia Lawall <julia.lawall@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
scripts/checkpatch.pl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/scripts/checkpatch.pl~checkpatch-allow-not-using-f-with-files-that-are-in-git-fix
+++ a/scripts/checkpatch.pl
@@ -979,7 +979,7 @@ sub git_is_single_file {
return 0 if ((which("git") eq "") || !(-e "$gitroot"));
- my $output = `${git_command} ls-files -- $filename`;
+ my $output = `${git_command} ls-files -- $filename 2>/dev/null`;
my $count = $output =~ tr/\n//;
return $count eq 1 && $output =~ m{^${filename}$};
}
_
Patches currently in -mm which might be from joe@xxxxxxxxxxx are
get_maintainer-add-test-for-file-in-vcs.patch
get_maintainer-exclude-maintainers-files-from-git-fallback.patch
checkpatch-move-repeated-word-test.patch
checkpatch-add-test-for-comma-use-that-should-be-semicolon.patch
checkpatch-warn-on-self-assignments.patch
checkpatch-allow-not-using-f-with-files-that-are-in-git.patch
checkpatch-emit-a-warning-on-embedded-filenames.patch
checkpatch-test-git_dir-changes.patch
