From b3a343c3a01615289e973826e66b9de89013ccd7 Mon Sep 17 00:00:00 2001 From: J0Z1L Date: Fri, 27 Feb 2026 23:58:44 +0100 Subject: [PATCH] Auto-restore local start.sh changes before git pull --- start.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/start.sh b/start.sh index d16c0b1..c3f2d33 100755 --- a/start.sh +++ b/start.sh @@ -41,6 +41,14 @@ if [[ "${START_BOOTSTRAPPED:-0}" != "1" ]]; then if [[ -d "${INSTALL_DIR}/.git" ]]; then echo "==> Repo vorhanden, aktualisiere: ${INSTALL_DIR}" if [[ "${SKIP_GIT_PULL:-0}" != "1" ]]; then + START_FILE_REL="$(basename "$0")" + if git -C "${INSTALL_DIR}" diff --quiet -- "${START_FILE_REL}"; then + : + else + echo "==> Lokale Aenderung an ${START_FILE_REL} erkannt, setze Datei fuer Update zurueck" + git -C "${INSTALL_DIR}" restore -- "${START_FILE_REL}" || true + fi + git -C "${INSTALL_DIR}" fetch --prune origin git -C "${INSTALL_DIR}" checkout "${REPO_BRANCH}" git -C "${INSTALL_DIR}" pull --ff-only origin "${REPO_BRANCH}"