Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Check for custom merge driver #276

Merged
merged 8 commits into from
Apr 29, 2024
Merged

Check for custom merge driver #276

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
39b8fe9
Check if merge driver is present
benedikt-schesch Apr 29, 2024
dcc716a
Check if merge driver is present
benedikt-schesch Apr 29, 2024
cb1be10
Style fix
benedikt-schesch Apr 29, 2024
c81d8ff
Check for bug in git ci/cd
benedikt-schesch Apr 29, 2024
323bc4d
Check for bug in git ci/cd
benedikt-schesch Apr 29, 2024
b7ad669
Check for bug in git ci/cd
benedikt-schesch Apr 29, 2024
bfa2b96
Check for bug in git ci/cd
benedikt-schesch Apr 29, 2024
331c42f
Check for bug in git ci/cd
benedikt-schesch Apr 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions run.sh
View file
Open in desktop
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
Loading