From 7f98f86aaf8781093d358c6a247e70e46382540f Mon Sep 17 00:00:00 2001
From: Nikolay Karpushkin <karpushkin@inr.ru>
Date: Thu, 25 Feb 2021 16:21:36 +0100
Subject: [PATCH] Clang format fix
---
scripts/check-apply-format-changes.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/check-apply-format-changes.sh b/scripts/check-apply-format-changes.sh
index 12f8a017e9..31f7e7aec8 100755
--- a/scripts/check-apply-format-changes.sh
+++ b/scripts/check-apply-format-changes.sh
@@ -39,12 +39,12 @@ case $1 in
check)
echo "Checking if there are format changes required"
git fetch $UPSTREAM
- $GIT_CLANG_FORMAT_BIN --commit $BASE_COMMIT --diff $CHANGED_FILES --extensions h,hpp,c,C,cpp,cxx,tpl
+ $GIT_CLANG_FORMAT_BIN --binary $CLANG_FORMAT_BIN --commit $BASE_COMMIT --diff $CHANGED_FILES --extensions h,hpp,c,C,cpp,cxx,tpl
;;
apply)
echo "Applying required format changes"
- $GIT_CLANG_FORMAT_BIN --verbose --commit $BASE_COMMIT $CHANGED_FILES --extensions h,hpp,c,C,cpp,cxx,tpl
+ $GIT_CLANG_FORMAT_BIN --binary $CLANG_FORMAT_BIN --verbose --commit $BASE_COMMIT $CHANGED_FILES --extensions h,hpp,c,C,cpp,cxx,tpl
git status
echo "Next step: git add "$CHANGED_FILES
echo 'Then : git commit -m"Apply clang-format"'
--
GitLab