Skip to content

Commit

Permalink
Make sure config files are empty
Browse files Browse the repository at this point in the history
  • Loading branch information
Benedikt Schesch committed May 6, 2024
1 parent 216294e commit 09139fc
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
Empty file added blanck_git_config.config
Empty file.
9 changes: 7 additions & 2 deletions run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down

0 comments on commit 09139fc

Please sign in to comment.