From ee8b6aac36b2ed304664cd4c7eadf0813bca3d80 Mon Sep 17 00:00:00 2001
From: Markus Heiser <markus.heiser@darmarit.de>
Date: Fri, 26 Nov 2021 14:48:39 +0100
Subject: [PATCH] [fix] searx.sh update: replace git pull by a hard reset

If the fetched branch has been rebased a 'git pull' will fails.  To get fetched
branch in the working tree, a git reset is needed.

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
---
 utils/searx.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/utils/searx.sh b/utils/searx.sh
index 09af3819d..819afef13 100755
--- a/utils/searx.sh
+++ b/utils/searx.sh
@@ -402,11 +402,11 @@ install_check() {
 update_searx() {
     rst_title "Update SearXNG instance"
 
-    echo
+    rst_para "fetch from $GIT_URL and reset to origin/$GIT_BRANCH"
     tee_stderr 0.3 <<EOF | sudo -H -u "${SERVICE_USER}" -i 2>&1 |  prefix_stdout "$_service_prefix"
 cd ${SEARX_SRC}
-git checkout -B "$GIT_BRANCH"
-git pull
+git fetch origin "$GIT_BRANCH"
+git reset --hard "origin/$GIT_BRANCH"
 pip install -U pip
 pip install -U setuptools
 pip install -U wheel