Fixed spork driver

benedikt-schesch · May 7, 2024 · 2eb54c3 · 2eb54c3
1 parent e90c33d
commit 2eb54c3
Showing 1 changed file with 7 additions and 2 deletions.
diff --git 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=$?