From 9ce95387dc875edc0d531c114dd5f3d0ea3dd7e7 Mon Sep 17 00:00:00 2001
From: P-A Loizeau <p.-a.loizeau@gsi.de>
Date: Thu, 3 Dec 2020 16:20:38 +0100
Subject: [PATCH] Use UPSTREAM variable in check/apply script
---
scripts/check-apply-format-changes.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/scripts/check-apply-format-changes.sh b/scripts/check-apply-format-changes.sh
index 61149db061..e837f302dd 100755
--- a/scripts/check-apply-format-changes.sh
+++ b/scripts/check-apply-format-changes.sh
@@ -28,7 +28,7 @@ if [ -z $UPSTREAM ]; then
fi
echo "Upstream name is :" $UPSTREAM
-BASE_COMMIT=upstream/master
+BASE_COMMIT=$UPSTREAM/master
CHANGED_FILES=$(git diff --name-only $BASE_COMMIT | grep -E '.*\.(h|hpp|c|C|cpp|cxx|tpl)$' | grep -viE '.*LinkDef.h$')
if [[ $# -ne 1 ]]; then
@@ -41,6 +41,7 @@ fi
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
;;
--
GitLab