Skip to content

Commit

Permalink
Add fake merge driver
Browse files Browse the repository at this point in the history
  • Loading branch information
benedikt-schesch committed May 7, 2024
1 parent 09139fc commit a7652be
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 10 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/small-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ jobs:
run: |
git config --global user.email "[email protected]"
git config --global user.name "Example Example"
git config --global merge.customMerge.name "Always incorrect custom merge driver"
git config --global merge.customMerge.driver 'fake-merge-driver %O %A %B %L %P'
make small-test
env:
GITHUB_TOKEN: ${{ secrets.TOKEN_GITHUB }}
10 changes: 0 additions & 10 deletions run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -63,16 +63,6 @@ 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."
# 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 a7652be

Please sign in to comment.