diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-08-27 14:33:41 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2019-08-27 14:33:41 +0200 |
| commit | bd9f6c23cbcce1ef2b334124c1cb9d0e3a7696ca (patch) | |
| tree | e327f7f27502b6ad6599d8087bf2af9d9db6b7bd | |
| parent | 472d10a0ade2df140363587ac1e9c508454b32a3 (diff) | |
Style: Don't apply clang-format to platform/android/java/src/com
| -rwxr-xr-x | misc/hooks/pre-commit-clang-format | 3 | ||||
| -rwxr-xr-x | misc/travis/clang-format.sh | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/misc/hooks/pre-commit-clang-format b/misc/hooks/pre-commit-clang-format index db241ad172..3a0ac9f389 100755 --- a/misc/hooks/pre-commit-clang-format +++ b/misc/hooks/pre-commit-clang-format @@ -86,6 +86,9 @@ do if grep -q "thirdparty" <<< $file; then continue; fi + if grep -q "platform/android/java/src/com" <<< $file; then + continue; + fi # ignore file if we do check for file extensions and the file # does not match any of the extensions specified in $FILE_EXTS diff --git a/misc/travis/clang-format.sh b/misc/travis/clang-format.sh index 5463a6cedf..48378281d4 100755 --- a/misc/travis/clang-format.sh +++ b/misc/travis/clang-format.sh @@ -11,7 +11,7 @@ else RANGE=HEAD fi -FILES=$(git diff-tree --no-commit-id --name-only -r $RANGE | grep -v thirdparty/ | grep -E "\.(c|h|cpp|hpp|cc|hh|cxx|m|mm|inc|java|glsl)$") +FILES=$(git diff-tree --no-commit-id --name-only -r $RANGE | grep -v thirdparty/ | grep -v platform/android/java/src/com/ | grep -E "\.(c|h|cpp|hpp|cc|hh|cxx|m|mm|inc|java|glsl)$") echo "Checking files:\n$FILES" # create a random filename to store our generated patch |