diff --git a/cmd/pkgdashcli/main.go b/cmd/pkgdashcli/main.go index 6e662b1..1027b32 100644 --- a/cmd/pkgdashcli/main.go +++ b/cmd/pkgdashcli/main.go @@ -214,6 +214,10 @@ func giteaPullRequest(ctx context.Context, cfg *Config, mods map[string]modules. if err != nil { logger.Fatalf(ctx, "failed to get repo head: %v", err) } + wtree, err := repo.Worktree() + if err != nil { + logger.Fatalf(ctx, "failed to get worktree: %v", err) + } for path, mod := range mods { wTitle.Reset() @@ -226,9 +230,16 @@ func giteaPullRequest(ctx context.Context, cfg *Config, mods map[string]modules. logger.Fatalf(ctx, "failed to create repo branch: %v", err) } - wtree, err := repo.Worktree() - if err != nil { - logger.Fatalf(ctx, "failed to get worktree: %v", err) + if err = wtree.Reset(&git.ResetOptions{}); err != nil { + logger.Fatalf(ctx, "failed to reset repo branch: %v", err) + } + + if err = wtree.Checkout(&git.CheckoutOptions{ + Branch: plumbing.NewBranchReferenceName(envBaseBranch), + Create: false, + Force: true, + }); err != nil { + logger.Fatalf(ctx, "failed to get checkout tree: %v", err) } epath, err := exec.LookPath("go")