diff options
Diffstat (limited to 'misc/scripts/clang_format.sh')
| -rwxr-xr-x | misc/scripts/clang_format.sh | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/misc/scripts/clang_format.sh b/misc/scripts/clang_format.sh index 13b5ab79b6..ba30ca8924 100755 --- a/misc/scripts/clang_format.sh +++ b/misc/scripts/clang_format.sh @@ -17,7 +17,9 @@ while read -r f; do continue elif [[ "$f" == *"glsl" ]]; then continue - elif [[ "$f" == "platform/android/java/lib/src/org/godotengine/godot/input/InputManager"* ]]; then + elif [[ "$f" == "platform/android/java/lib/src/org/godotengine/godot/gl/GLSurfaceView"* ]]; then + continue + elif [[ "$f" == "platform/android/java/lib/src/org/godotengine/godot/gl/EGLLogWrapper"* ]]; then continue fi @@ -26,13 +28,13 @@ done diff=$(git diff --color) -# If no patch has been generated all is OK, clean up, and exit. +# If no diff has been generated all is OK, clean up, and exit. if [ -z "$diff" ] ; then - printf "Files in this commit comply with the clang-tidy style rules.\n" + printf "Files in this commit comply with the clang-format style rules.\n" exit 0 fi -# A patch has been created, notify the user, clean up, and exit. +# A diff has been created, notify the user, clean up, and exit. printf "\n*** The following changes have been made to comply with the formatting rules:\n\n" echo "$diff" printf "\n*** Please fix your commit(s) with 'git commit --amend' or 'git rebase -i <hash>'\n" |