From 0dd8596f0010e271912c26dce18c894c660929e4 Mon Sep 17 00:00:00 2001
From: Knut Ahlers <knut@ahlers.me>
Date: Fri, 10 Mar 2023 18:28:46 +0100
Subject: [PATCH] Fix: Set upstream after rebase

Signed-off-by: Knut Ahlers <knut@ahlers.me>
---
 docker-entrypoint.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 4172a4f..614000f 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -74,7 +74,6 @@ function run_restore() {
 
   info "Setting up remote..."
   git remote add origin "${REMOTE}"
-  git branch -u origin "${BRANCH}"
 
   info "Fetching remote to reset..."
   git fetch ${REMOTE} ${BRANCH} || {
@@ -84,6 +83,7 @@ function run_restore() {
 
   info "Resetting to remote state..."
   git reset --hard FETCH_HEAD
+  git branch -u origin/"${BRANCH}" "${BRANCH}"
 
   [[ -z $CHOWN_UID ]] || chown -R ${CHOWN_UID}:${CHOWN_GID} .
 }