[LyX/master] lyxbuild: use function instead of duplicate code

commit 13c370320accb5b76d3cfa5b2cc388b3af20997f
Author: Scott Kostyshak <[email protected]>
Date:   Wed Jul 1 20:49:16 2026 +0200

    lyxbuild: use function instead of duplicate code
---
 development/lyx-tester/lyxbuild | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/development/lyx-tester/lyxbuild b/development/lyx-tester/lyxbuild
index 6b262a0f44..3b6d724fb1 100755
--- a/development/lyx-tester/lyxbuild
+++ b/development/lyx-tester/lyxbuild
@@ -105,7 +105,7 @@ function WARNINGPREFIX() {
 
 function if_bisect_restore_commit() {
   if [[ "${bisect}" == "1" && "${patch_old}" == "1" ]]; then
-    echo "$(ECHOPREFIX)checking out original bisect commit, before patches..."
+    echo "$(ECHOPREFIX)resetting and checking out original bisect commit, before patches (so good/bad works)..."
     echo "CD TO: ${gitRepoDIR}"
     cd "${gitRepoDIR}"
     git reset --hard
@@ -998,17 +998,7 @@ make_ret=$?
 if [ "${make_ret}" != 0 ]; then
   echo "$(ERRORPREFIX)running make" >&2
   cd "${gitRepoDIR}"
-  if [ "${bisect}" = "1" ] && [ "${patch_old}" = "1" ]; then
-    # The following is helpful when we are bisecting compilation success.
-    # todo: but it might be annoying when we are not, because we might want to
-    #       cd and then manually run 'make' to see the error, but because of
-    #       this it could cause a different error.
-    #
-    # restore so that "git bisect good/bad" works.
-    echo "$(ECHOPREFIX)reseting and checking out so that good/bad works..."
-    git reset --hard
-    git checkout "${hash_orig}"
-  fi
+  if_bisect_restore_commit
   exit 1
 fi
 end_chain=$(date +%s)
-- 
lyx-cvs mailing list
[email protected]
https://lists.lyx.org/mailman/listinfo/lyx-cvs