diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2018-08-01 15:30:56 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2018-08-01 15:30:56 -0700 |
| commit | f7e8c7ed4e2f33fc248ca6dd6a4eb5e8ea597735 (patch) | |
| tree | 0238e823061951e6a813b0079c14fae5cf6d2100 | |
| parent | 4d6f74994afcf68b9265b73ddf4c85a94069a924 (diff) | |
| download | qtlocation-mapboxgl-f7e8c7ed4e2f33fc248ca6dd6a4eb5e8ea597735.tar.gz | |
[build] Diff against the relevant branch for clang-tidy
Don't merge this to master.
| -rwxr-xr-x | scripts/clang-tools.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/clang-tools.sh b/scripts/clang-tools.sh index bdda4544b9..27c423f04b 100755 --- a/scripts/clang-tools.sh +++ b/scripts/clang-tools.sh @@ -33,7 +33,7 @@ function run_clang_tidy() { } function run_clang_tidy_diff() { - OUTPUT=$(git diff origin/master --src-prefix=${CDUP} --dst-prefix=${CDUP} | \ + OUTPUT=$(git diff origin/release-node-v4.0.0 --src-prefix=${CDUP} --dst-prefix=${CDUP} | \ ${CLANG_TIDY_PREFIX}/share/clang-tidy-diff.py \ -clang-tidy-binary ${CLANG_TIDY} \ 2>/dev/null) @@ -45,7 +45,7 @@ function run_clang_tidy_diff() { function run_clang_format() { echo "Running clang-format on $0..." - DIFF_FILES=$(git diff origin/master --name-only *cpp) + DIFF_FILES=$(git diff origin/release-node-v4.0.0 --name-only *cpp) echo "${DIFF_FILES}" | xargs -I{} -P ${JOBS} bash -c 'run_clang_format' {} ${CLANG_FORMAT} -i ${CDUP}/$0 || exit 1 } |