From e0fdaa18687f7f2447665fc0c7c8e050a019fee8 Mon Sep 17 00:00:00 2001 From: Gmer4Lfe Date: Sun, 31 May 2026 13:52:41 -0400 Subject: [PATCH] fix: set upstream tracking branch in bootstrap after clone git pull would fail on first run after install without tracking info. Co-Authored-By: Claude Sonnet 4.6 --- Plugin/varaverk.plg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Plugin/varaverk.plg b/Plugin/varaverk.plg index 343b81f..3a82f4e 100644 --- a/Plugin/varaverk.plg +++ b/Plugin/varaverk.plg @@ -145,6 +145,7 @@ if [[ ! -d "$SCRIPTS_DIR/.git" ]]; then git -C "$SCRIPTS_DIR" fetch --depth=1 origin "$BRANCH" >> "$LOG" 2>&1; then git -C "$SCRIPTS_DIR" reset --hard FETCH_HEAD >> "$LOG" 2>&1 git -C "$SCRIPTS_DIR" branch -M "$BRANCH" >> "$LOG" 2>&1 + git -C "$SCRIPTS_DIR" branch --set-upstream-to=origin/"$BRANCH" "$BRANCH" >> "$LOG" 2>&1 log "scripts installed from Gitea ($GITEA_IP)" CLONED=true else @@ -160,6 +161,7 @@ if [[ ! -d "$SCRIPTS_DIR/.git" ]]; then git -C "$SCRIPTS_DIR" fetch --depth=1 origin "$BRANCH" >> "$LOG" 2>&1; then git -C "$SCRIPTS_DIR" reset --hard FETCH_HEAD >> "$LOG" 2>&1 git -C "$SCRIPTS_DIR" branch -M "$BRANCH" >> "$LOG" 2>&1 + git -C "$SCRIPTS_DIR" branch --set-upstream-to=origin/"$BRANCH" "$BRANCH" >> "$LOG" 2>&1 log "scripts installed from GitHub" CLONED=true else