From 2eb54c350a8cb32fa7b4fc62b203048cc2d87be6 Mon Sep 17 00:00:00 2001
From: Benedikt Schesch <b.schesch@gmail.com>
Date: Mon, 6 May 2024 19:38:35 -0700
Subject: [PATCH] Fixed spork driver

---
 src/scripts/merge_tools/spork.sh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/scripts/merge_tools/spork.sh b/src/scripts/merge_tools/spork.sh
index e526003494..9124fb89e3 100755
--- a/src/scripts/merge_tools/spork.sh
+++ b/src/scripts/merge_tools/spork.sh
@@ -26,14 +26,19 @@ clone_dir=$1
 branch1=$2
 branch2=$3
 
+cd "$clone_dir" || exit
+
 # set up spork driver
 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"
+# print git config
+echo "*.java merge=spork" >> .gitattributes
 
 # perform merge
-cd "$clone_dir" || exit
+echo "Current git config:"
+git config --list
+
 git checkout "$branch1" --force
 git merge --no-edit "$branch2"
 retVal=$?