From 379cbd0d89b47972e36554914ebb5485bcc70157 Mon Sep 17 00:00:00 2001 From: Benedikt Schesch Date: Mon, 6 May 2024 18:33:16 -0700 Subject: [PATCH 1/2] Test --- .github/workflows/check-reproducibility.yml | 1 + run.sh | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/.github/workflows/check-reproducibility.yml b/.github/workflows/check-reproducibility.yml index 222ff81ada..e9d37c5597 100644 --- a/.github/workflows/check-reproducibility.yml +++ b/.github/workflows/check-reproducibility.yml @@ -44,6 +44,7 @@ jobs: run: | git config --global user.email "example@example.com" 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: diff --git a/run.sh b/run.sh index df3dc94cef..d216181bef 100755 --- a/run.sh +++ b/run.sh @@ -55,6 +55,10 @@ done PATH=$(pwd)/src/scripts/merge_tools/:$PATH export PATH +# Print current git global config +echo "Current global git config:" +git config --list --show-origin + GIT_CONFIG_GLOBAL=$(pwd)/blanck_git_config.config export GIT_CONFIG_GLOBAL if git config --list --show-origin | grep 'file:'"$GIT_CONFIG_GLOBAL" > /dev/null; then From 1469c87577db7185334765517eed97ae01ca1f71 Mon Sep 17 00:00:00 2001 From: Benedikt Schesch Date: Mon, 6 May 2024 18:43:45 -0700 Subject: [PATCH 2/2] Spork update --- src/scripts/merge_tools/spork.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/scripts/merge_tools/spork.sh b/src/scripts/merge_tools/spork.sh index 2753140916..e526003494 100755 --- a/src/scripts/merge_tools/spork.sh +++ b/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