summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorRichard Genoud <richard.genoud@gmail.com>2014-02-10 14:25:32 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2014-02-10 16:01:40 -0800
commit3645e3283b90524ed9a6b33b68c93ee29d1bfeb9 (patch)
tree0f634b2d3600ce5d187084027ba1959c77379805 /scripts
parentec83b616a71d76cc062371339472ed66ba405824 (diff)
downloadlinux-stable-3645e3283b90524ed9a6b33b68c93ee29d1bfeb9.tar.gz
linux-stable-3645e3283b90524ed9a6b33b68c93ee29d1bfeb9.tar.bz2
linux-stable-3645e3283b90524ed9a6b33b68c93ee29d1bfeb9.zip
checkpatch: fix detection of git repository
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>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/checkpatch.pl4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 0ea2a1e24ade..464dcef79b35 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -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";
@@ -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);
}