git 逻辑

2026-06-10 15:30:52 +08:00
parent 41f2a84979
commit 023ab2f30e
17 changed files with 221 additions and 64 deletions
@@ -46,7 +46,7 @@ func (s *worktreeService) Create(ctx context.Context, c Caller, wsID uuid.UUID,
 		return nil, errs.Wrap(err, errs.CodeInvalidInput, "invalid base branch")
 	}
 	wtPath := WorktreePath(s.dataDir, wsID, in.Branch)
-	if err := s.gitr.WorktreeAdd(ctx, ws.MainPath, in.Branch, wtPath); err != nil {
+	if err := s.gitr.WorktreeAdd(ctx, ws.MainPath, in.Branch, wtPath, "origin/"+base); err != nil {
 		if git.IsConflict(err) {
 			return nil, errs.Wrap(err, errs.CodeWorktreeBranchConflict, "branch already used")
 		}