Check for bug in git ci/cd

run.sh

@@ -56,15 +56,17 @@ PATH=$(pwd)/src/scripts/merge_tools/:$PATH
 export PATH
 
 echo "Checking for custom merge drivers in global configuration..."
-merge_drivers=$(git config --global --get-regexp '^merge\..*\.driver$' || echo "No merge drivers set")
-echo "Merge drivers found: $merge_drivers"
-if [ -n "$merge_drivers" ]; then
+merge_drivers=$(git config --global --get-regexp '^merge\..*\.driver$' 2>/dev/null)
+if [ -z "$merge_drivers" ]; then
+    # No merge drivers found, proceed normally
+    echo "No custom merge drivers set in global configuration. Proceeding..."
+else
+    # Merge drivers found, raise an error
     echo "Error: Custom merge drivers are set in global configuration."
     echo "Please unset them before running the evaluation."
     echo "Merge driver found: $merge_drivers"
     exit 1
 fi
-echo "No custom merge drivers found in global configuration."
 
 # Check if cache.tar exists and cache is missing
 if [ -f cache.tar ] && [ ! -d cache ]; then