From 91bc28508454384a2767c968765e135eccb29b05 Mon Sep 17 00:00:00 2001 From: Elton Leander Pinto Date: Tue, 20 Jul 2021 12:35:19 -0700 Subject: [PATCH] Fix clang-tidy error in pre-commit script (#61918) Summary: Fixes a clang-tidy error in the git-pre-commit script. See log below for the error it fixes. ``` Running pre-commit flake8 Running pre-commit clang-tidy usage: clang_tidy [-h] [-e CLANG_TIDY_EXE] [-g GLOB] [-x REGEX] [-c COMPILE_COMMANDS_DIR] [--diff-file DIFF_FILE] [-p PATHS [PATHS ...]] [-n] [-v] [-q] [--config-file CONFIG_FILE] [--print-include-paths] [-I INCLUDE_DIR] [-s] [--disable-progress-bar] [extra_args [extra_args ...]] clang_tidy: error: unrecognized arguments: -j ``` It gets rid of the redundant binary check because `tools.linter.clang_tidy` already does this. Pull Request resolved: https://github.com/pytorch/pytorch/pull/61918 Test Plan: Run `tools/git-pre-commit`. It should not show a clang-tidy error. Reviewed By: driazati Differential Revision: D29796383 Pulled By: 1ntEgr8 fbshipit-source-id: b804b0170747f04e84d21e03d1c4985748d78cf2 --- tools/git-pre-commit | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/tools/git-pre-commit b/tools/git-pre-commit index cdca9a4b1155ac..1c4340c6b43486 100755 --- a/tools/git-pre-commit +++ b/tools/git-pre-commit @@ -2,25 +2,12 @@ set -e echo "Running pre-commit flake8" -python tools/linter/flake8_hook.py +python3 tools/linter/flake8_hook.py -if [ $(which clang-tidy) ] -then - echo "Running pre-commit clang-tidy" - git diff HEAD > pr.diff - python tools/linter/clang_tidy \ - --paths torch/csrc \ - --diff-file "pr.diff" \ - -g"-torch/csrc/jit/passes/onnx/helper.cpp" \ - -g"-torch/csrc/jit/passes/onnx/shape_type_inference.cpp" \ - -g"-torch/csrc/jit/serialization/onnx.cpp" \ - -g"-torch/csrc/jit/serialization/export.cpp" \ - -g"-torch/csrc/jit/serialization/import.cpp" \ - -j -else - echo "WARNING: Couldn't find clang-tidy executable." - echo " Please install it if you want local clang-tidy checks." -fi +echo "Running pre-commit clang-tidy" +git diff HEAD > pr.diff +python3 -m tools.linter.clang_tidy --diff-file "pr.diff" +rm pr.diff echo "Running pre-commit clang-format" tools/linter/git-clang-format HEAD~ --force