Skip to content

Commit

Permalink
Check for custom merge driver (#276)
Browse files Browse the repository at this point in the history
  • Loading branch information
benedikt-schesch authored Apr 29, 2024
1 parent 21549ff commit 6ae7ec2
Showing 1 changed file with 13 additions and 0 deletions.
13 changes: 13 additions & 0 deletions run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,19 @@ 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")

if [ "$merge_drivers" == "No merge drivers set" ]; then
echo "No custom merge drivers found in global configuration. Proceeding with the evaluation."
# Include other commands to continue the script here
else
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

# Check if cache.tar exists and cache is missing
if [ -f cache.tar ] && [ ! -d cache ]; then
echo "Decompressing cache.tar"
Expand Down

0 comments on commit 6ae7ec2

Please sign in to comment.