From ddc2f5050574ffd0ba9031880900e52391196700 Mon Sep 17 00:00:00 2001 From: Alex Palaistras Date: Sat, 29 Oct 2022 17:38:39 +0100 Subject: [PATCH] hugo: Always hard-reset to `origin` after fetching --- service/hugo/container/config/deploy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/service/hugo/container/config/deploy.sh b/service/hugo/container/config/deploy.sh index 5c0cd50..3d0034f 100755 --- a/service/hugo/container/config/deploy.sh +++ b/service/hugo/container/config/deploy.sh @@ -22,7 +22,7 @@ export GIT_SSH_COMMAND if test -d "$GIT_DIR_NAME"; then cd "$GIT_DIR_NAME" - git fetch origin "$GIT_BRANCH" && git reset --hard "$GIT_BRANCH" + git fetch origin "$GIT_BRANCH" && git reset --hard origin else git clone --depth 1 --branch "$GIT_BRANCH" -- "$GIT_REPO_URL" "$GIT_DIR_NAME" cd "$GIT_DIR_NAME"