fix(deploy): recover from diverging git after force-push on kalinamall

Co-authored-by: Cursor <cursoragent@cursor.com>

deploy/sac-deploy.sh

@@ -30,8 +30,19 @@ fi
 log "Выравнивание владельца ${APP_ROOT} → ${APP_USER}:${APP_USER}"
 chown -R "${APP_USER}:${APP_USER}" "${APP_ROOT}"
 
-log "git pull"
-sudo -u "${APP_USER}" git -C "${APP_ROOT}" pull --ff-only
+log "git fetch + sync"
+sudo -u "${APP_USER}" git -C "${APP_ROOT}" fetch --prune
+
+if sudo -u "${APP_USER}" git -C "${APP_ROOT}" pull --ff-only 2>/dev/null; then
+ log "git: fast-forward OK"
+else
+ UPSTREAM="$(sudo -u "${APP_USER}" git -C "${APP_ROOT}" rev-parse --abbrev-ref '@{u}' 2>/dev/null || true)"
+ if [ -z "${UPSTREAM}" ]; then
+  UPSTREAM="origin/main"
+ fi
+ log "WARN: fast-forward невозможен (часто после force-push на kalinamall) — reset --hard ${UPSTREAM}"
+ sudo -u "${APP_USER}" git -C "${APP_ROOT}" reset --hard "${UPSTREAM}"
+fi
 
 if [ ! -f "${CONFIG_FILE}" ]; then
  die "Нет конфига: ${CONFIG_FILE}"