From b5ea4fe3de8831071ad4b5381e26222a9105ab51 Mon Sep 17 00:00:00 2001 From: Roland Date: Sat, 15 Jan 2022 19:52:55 -0700 Subject: [PATCH] Forcing reset of branch when checking out git branch. --- install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.sh b/install.sh index 6bbc58f4..c8894b16 100755 --- a/install.sh +++ b/install.sh @@ -56,7 +56,7 @@ npm install -g 'git+https://github.com/pirate/readability-extractor' # Get the latest WROLPi code git --version git clone https://github.com/lrnselfreliance/wrolpi.git /opt/wrolpi || : -(cd /opt/wrolpi && git fetch && git checkout "${BRANCH}" && git pull origin "${BRANCH}" --rebase) || exit 3 +(cd /opt/wrolpi && git checkout "${BRANCH}" && git reset --hard origin/"${BRANCH}") || exit 3 # Setup the virtual environment that main.py expects pip3 --version || (