From 98441c0394b6e6c2c320e291d4ebb489e1b36043 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Wed, 17 Jul 2024 07:27:50 +0200
Subject: [PATCH] extras/cherry-test: don't require explanations for rebase

rebase changes are similar code with the code around the changes different.
---
 extras/misc/cherry-test.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/extras/misc/cherry-test.sh b/extras/misc/cherry-test.sh
index b51d2934e5..d83eb94af5 100755
--- a/extras/misc/cherry-test.sh
+++ b/extras/misc/cherry-test.sh
@@ -97,12 +97,12 @@ for l in $CHERRY_PICKED; do
         fi
 
         IS_EXPLAINED=$(echo "$GIT_LOG" | grep "rebased:")
-        if test -z "$IS_EXPLAINED"; then
-            echo "Unexplained rebase: $(git log $l~1..$l)"
-            EXIT_CODE=1
-        else
+        # if test -z "$IS_EXPLAINED"; then
+        #     echo "Unexplained rebase: $(git log $l~1..$l)"
+        #     EXIT_CODE=1
+        # else
             rm -rf patches-new/$h.diff patches-orig/$h.diff
-        fi
+        # fi
     else
         if test -z "$PATCH_DIFF2"; then
             echo "Rebase marked as edit: $(git log $l~1..$l)"