From 09139fc988ef6f6f7dea2cfe4b2b41991a8ab2b7 Mon Sep 17 00:00:00 2001 From: Benedikt Schesch Date: Mon, 6 May 2024 16:38:55 -0700 Subject: [PATCH] Make sure config files are empty --- blanck_git_config.config | 0 run.sh | 9 +++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 blanck_git_config.config diff --git a/blanck_git_config.config b/blanck_git_config.config new file mode 100644 index 0000000000..e69de29bb2 diff --git a/run.sh b/run.sh index fa5dd67d31..994a84e45d 100755 --- a/run.sh +++ b/run.sh @@ -55,8 +55,13 @@ done 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") +export GIT_CONFIG_GLOBAL=$(pwd)/blanck_git_config.config +if git config --list --show-origin | grep 'file:'"$GIT_CONFIG_GLOBAL" > /dev/null; then + echo "Error: Global config is not empty" + exit 1 +else + echo "Global config is empty" +fi if [ "$merge_drivers" == "No merge drivers set" ]; then echo "No custom merge drivers found in global configuration. Proceeding with the evaluation."