From b508904fcfe2ef56094a4185d4fcc1d17abcb728 Mon Sep 17 00:00:00 2001 From: P-A Loizeau <p.-a.loizeau@gsi.de> Date: Wed, 25 Nov 2020 16:10:33 +0100 Subject: [PATCH] Add scripts to check and apply same format sequence as in MR --- scripts/apply-format-changes.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/apply-format-changes.sh b/scripts/apply-format-changes.sh index 2d07efc0a2..c28640f3fd 100755 --- a/scripts/apply-format-changes.sh +++ b/scripts/apply-format-changes.sh @@ -3,11 +3,14 @@ BASE_COMMIT=${FAIRROOT_FORMAT_BASE:-HEAD} CHANGED_FILES=$(git diff --name-only $BASE_COMMIT | grep -E '.*\.(h|hpp|c|C|cpp|cxx|tpl)$' | grep -viE '.*LinkDef.h$') if [ -z $GIT_CLANG_FORMAT_BIN ]; then + echo "Warning:" echo "GIT_CLANG_FORMAT_BIN not defined, trying to use git-clang-format-10 if present" + echo "" GIT_CLANG_FORMAT_BIN=git-clang-format-10 fi $GIT_CLANG_FORMAT_BIN --verbose --commit $BASE_COMMIT $CHANGED_FILES --extensions h,hpp,c,C,cpp,cxx,tpl git add $CHANGED_FILES +echo "" git status git commit -m"Apply clang-format" -- GitLab