From aa34992747086d7469aa3b0061426eef17a6e12f Mon Sep 17 00:00:00 2001
From: Shahzad Malik Muzaffar <shahzad.malik.muzaffar@cern.ch>
Date: Fri, 6 Feb 2026 18:10:45 +0100
Subject: [PATCH 1/2] Temp change to use IB clang-format for
 CMSSW_16_1_X_2026-02-06-1100

---
 run-pr-code-checks | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/run-pr-code-checks b/run-pr-code-checks
index 03e0daaf9efc..27d17c57fe63 100755
--- a/run-pr-code-checks
+++ b/run-pr-code-checks
@@ -141,8 +141,20 @@ if $CODE_FORMAT ; then
   if [ -f ${CMSSW_BASE}/src/.clang-format ] ; then
     grep -v '\.inc$' ${UP_DIR}/all-changed-files.txt > ${UP_DIR}/code-format-files.txt || true
     if [ -s ${UP_DIR}/code-format-files.txt ] ; then
+      USE_OLD_CODE_FORMAT=false
+      if [ "${RELEASE_FORMAT}" == "CMSSW_16_1_X_2026-02-06-1100" ] ; then
+        if [ $(diff ${CMSSW_RELEASE_BASE}/src/.clang-format ${CMSSW_BASE}/src/.clang-format | wc -l) -gt 0 ] ; then
+          echo "Clang format file changed in dev area. Using the IB clang format file"
+        fi
+        #if [ $(diff ${CMSSW_RELEASE_BASE}/src/.clang-format ${CMSSW_BASE}/src/.clang-format | wc -l) -gt 0 ] ; then
+          mv  ${CMSSW_BASE}/src/.clang-format ${CMSSW_BASE}/.orig-clang-format
+          cp ${CMSSW_RELEASE_BASE}/src/.clang-format ${CMSSW_BASE}/src/.clang-format
+          USE_OLD_CODE_FORMAT=true
+        #fi
+      fi
       scram build -k -j $NUM_PROC code-format USER_CODE_FORMAT_FILE="${UP_DIR}/code-format-files.txt" > ${UP_DIR}/code-format.log 2>&1
       pushd $CMSSW_BASE/src
+        if $USE_OLD_CODE_FORMAT ; then mv ${CMSSW_BASE}/.orig-clang-format ${CMSSW_BASE}/src/.clang-format ; fi
         git diff > ${UP_DIR}/code-format.patch
         if [ -s ${UP_DIR}/code-format.patch ] ; then
           git commit -a -m 'auto applied code-formats changes'

From a348315d1bd2c54d33f55664879fe6cce16bb8a8 Mon Sep 17 00:00:00 2001
From: Malik Shahzad Muzaffar <shahzad.malik.muzaffar@cern.ch>
Date: Fri, 6 Feb 2026 18:26:13 +0100
Subject: [PATCH 2/2] Update run-pr-code-checks

---
 run-pr-code-checks | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/run-pr-code-checks b/run-pr-code-checks
index 27d17c57fe63..048afb0c0ac4 100755
--- a/run-pr-code-checks
+++ b/run-pr-code-checks
@@ -144,13 +144,11 @@ if $CODE_FORMAT ; then
       USE_OLD_CODE_FORMAT=false
       if [ "${RELEASE_FORMAT}" == "CMSSW_16_1_X_2026-02-06-1100" ] ; then
         if [ $(diff ${CMSSW_RELEASE_BASE}/src/.clang-format ${CMSSW_BASE}/src/.clang-format | wc -l) -gt 0 ] ; then
-          echo "Clang format file changed in dev area. Using the IB clang format file"
-        fi
-        #if [ $(diff ${CMSSW_RELEASE_BASE}/src/.clang-format ${CMSSW_BASE}/src/.clang-format | wc -l) -gt 0 ] ; then
+          echo "Clang format file changed in dev area. Using the IB clang format file."
           mv  ${CMSSW_BASE}/src/.clang-format ${CMSSW_BASE}/.orig-clang-format
           cp ${CMSSW_RELEASE_BASE}/src/.clang-format ${CMSSW_BASE}/src/.clang-format
           USE_OLD_CODE_FORMAT=true
-        #fi
+        fi
       fi
       scram build -k -j $NUM_PROC code-format USER_CODE_FORMAT_FILE="${UP_DIR}/code-format-files.txt" > ${UP_DIR}/code-format.log 2>&1
       pushd $CMSSW_BASE/src