Browse Source

Overwrite worktree

bryan 10 months ago
parent
commit
2d816f3b8a
1 changed files with 1 additions and 2 deletions
  1. 1 2
      openwrtbuilder

+ 1 - 2
openwrtbuilder

@@ -566,7 +566,6 @@ fromSource() {
     wt_cmd=(git -C "$GITSRCDIR"
             worktree add
             --force
-            --force
             --detach
             "$GITWORKTREEDIR")
  
@@ -590,7 +589,7 @@ fromSource() {
             ;;
     esac
 
-    # [[ -d "$GITWORKTREEDIR" ]] && rm -rf "$GITWORKTREEDIR"
+    [[ -d "$GITWORKTREEDIR" ]] && rm -rf "$GITWORKTREEDIR" # overwrite worktree changes
     
     execute "${wt_cmd[@]}" "$wt_commit"