Added correct gitconfig

.github/workflows/check-reproducibility.yml

@@ -44,6 +44,7 @@ jobs:
       run: |
         git config --global user.email "[email protected]"
         git config --global user.name "Example Example"
+        python3 src/python/replay_merge.py --idx 522-15 -delete_workdir
         head -n 151 results/combined/result.csv > temp.csv && mv temp.csv results/combined/result.csv
         make NUM_PROCESSES=1 check-merges-reproducibility
       env:

.github/workflows/small-test.yml

@@ -56,8 +56,6 @@ jobs:
     - run: echo "LOGURU_COLORIZE=NO" >> $GITHUB_ENV
     - name: Run small test
       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

run.sh

@@ -57,12 +57,6 @@ export PATH
 
 GIT_CONFIG_GLOBAL=$(pwd)/.gitconfig
 export GIT_CONFIG_GLOBAL
-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
 
 # Check if cache.tar exists and cache is missing
 if [ -f cache.tar ] && [ ! -d cache ]; then

src/scripts/merge_tools/spork.sh

@@ -27,9 +27,9 @@ branch1=$2
 branch2=$3
 
 # set up spork driver
-(echo "[merge \"spork\"]";
-    echo "    name = spork";
-    echo "    driver = java -jar $spork_absolutepath --git-mode %A %O %B -o %A") >> "$clone_dir/.git/config"
+git config --local merge.spork.name "spork"
+git config --local merge.spork.driver "java -jar $spork_absolutepath --git-mode %A %O %B -o %A"
+
 echo "*.java merge=spork" >> "$clone_dir/.gitattributes"
 
 # perform merge