summaryrefslogtreecommitdiff
path: root/util/lint
diff options
context:
space:
mode:
Diffstat (limited to 'util/lint')
-rwxr-xr-xutil/lint/check-style9
-rwxr-xr-xutil/lint/lint-stable-022-clang-format2
2 files changed, 7 insertions, 4 deletions
diff --git a/util/lint/check-style b/util/lint/check-style
index 2237ed6295..f72d7b42c5 100755
--- a/util/lint/check-style
+++ b/util/lint/check-style
@@ -137,7 +137,10 @@ cat "$patch"
printf "\nYou can apply these changes with:\n git apply $patch\n"
printf "(may need to be called from the root directory of your repository)\n"
-printf "Aborting commit. Apply changes and commit again or skip checking with"
-printf " --no-verify (not recommended).\n"
-exit 1
+# FIXME: clang-format is currently unusable, so don't abort the commit.
+# printf "Aborting commit. Apply changes and commit again or skip checking with"
+# printf " --no-verify (not recommended).\n"
+# exit 1
+
+exit 0
diff --git a/util/lint/lint-stable-022-clang-format b/util/lint/lint-stable-022-clang-format
index bd662e472f..48f51a8e77 100755
--- a/util/lint/lint-stable-022-clang-format
+++ b/util/lint/lint-stable-022-clang-format
@@ -33,6 +33,6 @@ if [ $(clang-format $files_to_check | wc -l) -gt 0 ]; then
if [ "$(git diff --no-prefix HEAD~..HEAD -- $files_to_check | clang-format-diff)" != "" ]; then
echo "Coding style mismatch. The following patch fixes it:"
git diff --no-prefix HEAD~..HEAD -- $files_to_check | clang-format-diff
- exit 1
+ exit 0
fi
fi