Skip to content

Commit

Permalink
checkpatch: fix detection of git repository
Browse files Browse the repository at this point in the history
Since git v1.7.7, the .git directory can be a file when, for example,
the kernel is a submodule of another git super project.  So, the check
"-d .git" is not working anymore in this case.  Using a more generic
check like "-e .git" corrects this behaviour.

Signed-off-by: Richard Genoud <richard.genoud@gmail.com>
Cc: Andy Whitcroft <apw@canonical.com>
Cc: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Richard Genoud authored and Linus Torvalds committed Feb 11, 2014
1 parent ec83b61 commit 3645e32
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions scripts/checkpatch.pl
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,7 @@ sub seed_camelcase_includes {

$camelcase_seeded = 1;

if (-d ".git") {
if (-e ".git") {
my $git_last_include_commit = `git log --no-merges --pretty=format:"%h%n" -1 -- include`;
chomp $git_last_include_commit;
$camelcase_cache = ".checkpatch-camelcase.git.$git_last_include_commit";
Expand Down Expand Up @@ -499,7 +499,7 @@ sub seed_camelcase_includes {
return;
}

if (-d ".git") {
if (-e ".git") {
$files = `git ls-files "include/*.h"`;
@include_files = split('\n', $files);
}
Expand Down

0 comments on commit 3645e32

Please sign in to comment.