diff options
| author | Alex Thiessen <alex.thiessen.de+coreboot@gmail.com> | 2018-01-16 23:05:48 +0000 |
|---|---|---|
| committer | Martin Roth <martinroth@google.com> | 2018-01-23 05:42:51 +0000 |
| commit | 73f19dca386d775a880bdc945efaa6b9c77d9e94 (patch) | |
| tree | b7814be8453de7044ad8078fc048aae2514ec5d4 /util/lint/lint-014-qualified-types | |
| parent | 583e0522f14fde040f48d2444099e4dededfa185 (diff) | |
util/lint: Unify checks for git worktree
Linters try to determine whether they are running in a git worktree so
that `git grep` can be used instead of `grep`. These checks are done in
different not truly correct ways and thus the linters don't use `git
grep` when running from a worktree subdirectory, e.g. in a git subtree
environment.
Unify checks using `git rev-parse --is-inside-work-tree`.
Change-Id: I3f54afc99ad0f0e3052cffdd32bdd9649cf3d720
Signed-off-by: Alex Thiessen <alex.thiessen.de+coreboot@gmail.com>
Reviewed-on: https://review.coreboot.org/23297
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Diffstat (limited to 'util/lint/lint-014-qualified-types')
| -rwxr-xr-x | util/lint/lint-014-qualified-types | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/util/lint/lint-014-qualified-types b/util/lint/lint-014-qualified-types index 58b48b705e..98679ea55e 100755 --- a/util/lint/lint-014-qualified-types +++ b/util/lint/lint-014-qualified-types @@ -21,7 +21,9 @@ EXCLUDED_DIRS='^src/vendorcode\|^util/romcc\|cbfstool/lzma\|cbfstool/lz4' INCLUDED_FILES='\.[ch]:' # Use git grep if the code is in a git repo, otherwise use grep. -if [ -n "$(command -v git)" ] && [ -d .git ]; then +if [ -n "$(command -v git)" ] && \ + [ "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = "true" ] +then GREP_FILES="git grep -n" else GREP_FILES="grep -rn" |