From 97f6e0a927fd8296a864ad4c8f92f99495a230b3 Mon Sep 17 00:00:00 2001 From: bryan Date: Tue, 31 Jan 2023 15:33:21 -0500 Subject: [PATCH] Fix track remote branch --- openwrtbuilder | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/openwrtbuilder b/openwrtbuilder index b03fb4e..326fa31 100755 --- a/openwrtbuilder +++ b/openwrtbuilder @@ -632,10 +632,20 @@ fromSource() { if [[ $RELEASE == "snapshot" ]]; then gitworktreedir="$SRCDIR/$profile/$RELEASE" - git -C "$GITSRCDIR" worktree add -fd "$gitworktreedir" master + git -C "$GITSRCDIR" \ + worktree add \ + --force \ + --detach \ + "$gitworktreedir" \ + "master" else gitworktreedir="$SRCDIR/$profile/$RELEASE" - git -C "$GITSRCDIR" worktree add -fd "$gitworktreedir" "openwrt-${RELEASE%.*}" + git -C "$GITSRCDIR" \ + worktree add \ + --force \ + --detach \ + "$gitworktreedir" \ + "origin/openwrt-${RELEASE%.*}" fi seed_file="$gitworktreedir/.config"