From 39b8fe949b78bb21b00fd097eb84eafefeb65fb8 Mon Sep 17 00:00:00 2001 From: Benedikt Schesch Date: Sun, 28 Apr 2024 20:14:21 -0700 Subject: [PATCH 1/8] Check if merge driver is present --- run.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/run.sh b/run.sh index 2c3fb9ed92..997aed6e17 100755 --- a/run.sh +++ b/run.sh @@ -55,6 +55,14 @@ done PATH=$(pwd)/src/scripts/merge_tools/:$PATH export PATH +merge_drivers=$(git config --local --get-regexp '^merge\..*\.driver$') +if [ ! -z "$merge_drivers" ]; then + echo "Error: Custom merge drivers are set in global configuration." + echo "Please unset them before running the evaluation." + echo "$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" From dcc716a2a81e6b8c4d0188aab42b94e8dedf6587 Mon Sep 17 00:00:00 2001 From: Benedikt Schesch Date: Sun, 28 Apr 2024 20:15:08 -0700 Subject: [PATCH 2/8] Check if merge driver is present --- run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run.sh b/run.sh index 997aed6e17..37b49601ac 100755 --- a/run.sh +++ b/run.sh @@ -59,7 +59,7 @@ merge_drivers=$(git config --local --get-regexp '^merge\..*\.driver$') if [ ! -z "$merge_drivers" ]; then echo "Error: Custom merge drivers are set in global configuration." echo "Please unset them before running the evaluation." - echo "$merge_drivers" + echo "Merge driver found: $merge_drivers" exit 1 fi From cb1be100a0621314084643c6461227e062e2624b Mon Sep 17 00:00:00 2001 From: Benedikt Schesch Date: Sun, 28 Apr 2024 20:17:53 -0700 Subject: [PATCH 3/8] Style fix --- run.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/run.sh b/run.sh index 37b49601ac..a005897ae4 100755 --- a/run.sh +++ b/run.sh @@ -55,8 +55,8 @@ done PATH=$(pwd)/src/scripts/merge_tools/:$PATH export PATH -merge_drivers=$(git config --local --get-regexp '^merge\..*\.driver$') -if [ ! -z "$merge_drivers" ]; then +merge_drivers=$(git config --global --get-regexp '^merge\..*\.driver$') +if [ -n "$merge_drivers" ]; then echo "Error: Custom merge drivers are set in global configuration." echo "Please unset them before running the evaluation." echo "Merge driver found: $merge_drivers" From c81d8ff96ab09d6e41e0c99eda7d78d32f726d28 Mon Sep 17 00:00:00 2001 From: Benedikt Schesch Date: Sun, 28 Apr 2024 20:25:02 -0700 Subject: [PATCH 4/8] Check for bug in git ci/cd --- run.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/run.sh b/run.sh index a005897ae4..6b0a4d8605 100755 --- a/run.sh +++ b/run.sh @@ -55,6 +55,7 @@ done PATH=$(pwd)/src/scripts/merge_tools/:$PATH export PATH +echo "Checking for custom merge drivers in global configuration..." merge_drivers=$(git config --global --get-regexp '^merge\..*\.driver$') if [ -n "$merge_drivers" ]; then echo "Error: Custom merge drivers are set in global configuration." From 323bc4d40d9141d918e615eddec637ad9879df35 Mon Sep 17 00:00:00 2001 From: Benedikt Schesch Date: Sun, 28 Apr 2024 20:29:42 -0700 Subject: [PATCH 5/8] Check for bug in git ci/cd --- run.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/run.sh b/run.sh index 6b0a4d8605..b668246ffd 100755 --- a/run.sh +++ b/run.sh @@ -57,12 +57,14 @@ export PATH echo "Checking for custom merge drivers in global configuration..." merge_drivers=$(git config --global --get-regexp '^merge\..*\.driver$') +echo "Merge drivers found: $merge_drivers" if [ -n "$merge_drivers" ]; then 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 +echo "No custom merge drivers found in global configuration." # Check if cache.tar exists and cache is missing if [ -f cache.tar ] && [ ! -d cache ]; then From b7ad66948221f7fca88cd644bbf7d8c7b92f057e Mon Sep 17 00:00:00 2001 From: Benedikt Schesch Date: Sun, 28 Apr 2024 20:34:55 -0700 Subject: [PATCH 6/8] Check for bug in git ci/cd --- run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run.sh b/run.sh index b668246ffd..1e0fb215f4 100755 --- a/run.sh +++ b/run.sh @@ -56,7 +56,7 @@ PATH=$(pwd)/src/scripts/merge_tools/:$PATH export PATH echo "Checking for custom merge drivers in global configuration..." -merge_drivers=$(git config --global --get-regexp '^merge\..*\.driver$') +merge_drivers=$(git config --global --get-regexp '^merge\..*\.driver$' || echo "No merge drivers set") echo "Merge drivers found: $merge_drivers" if [ -n "$merge_drivers" ]; then echo "Error: Custom merge drivers are set in global configuration." From bfa2b96649e04cb20eb09215ba713dde63cb577a Mon Sep 17 00:00:00 2001 From: Benedikt Schesch Date: Sun, 28 Apr 2024 20:40:52 -0700 Subject: [PATCH 7/8] Check for bug in git ci/cd --- run.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/run.sh b/run.sh index 1e0fb215f4..96b44aa299 100755 --- a/run.sh +++ b/run.sh @@ -56,15 +56,17 @@ PATH=$(pwd)/src/scripts/merge_tools/:$PATH export PATH echo "Checking for custom merge drivers in global configuration..." -merge_drivers=$(git config --global --get-regexp '^merge\..*\.driver$' || echo "No merge drivers set") -echo "Merge drivers found: $merge_drivers" -if [ -n "$merge_drivers" ]; then +merge_drivers=$(git config --global --get-regexp '^merge\..*\.driver$' 2>/dev/null) +if [ -z "$merge_drivers" ]; then + # No merge drivers found, proceed normally + echo "No custom merge drivers set in global configuration. Proceeding..." +else + # Merge drivers found, raise an error 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 -echo "No custom merge drivers found in global configuration." # Check if cache.tar exists and cache is missing if [ -f cache.tar ] && [ ! -d cache ]; then From 331c42f87c3d7aafa4c5f7afec8df77ff3fe61af Mon Sep 17 00:00:00 2001 From: Benedikt Schesch Date: Sun, 28 Apr 2024 20:47:39 -0700 Subject: [PATCH 8/8] Check for bug in git ci/cd --- run.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/run.sh b/run.sh index 96b44aa299..bf66245c7a 100755 --- a/run.sh +++ b/run.sh @@ -56,12 +56,12 @@ PATH=$(pwd)/src/scripts/merge_tools/:$PATH export PATH echo "Checking for custom merge drivers in global configuration..." -merge_drivers=$(git config --global --get-regexp '^merge\..*\.driver$' 2>/dev/null) -if [ -z "$merge_drivers" ]; then - # No merge drivers found, proceed normally - echo "No custom merge drivers set in global configuration. Proceeding..." +merge_drivers=$(git config --global --get-regexp '^merge\..*\.driver$' || echo "No merge drivers set") + +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 - # Merge drivers found, raise an error echo "Error: Custom merge drivers are set in global configuration." echo "Please unset them before running the evaluation." echo "Merge driver found: $merge_drivers"