Skip to content

fix git reconciler error: worktree contains unstaged changes #175

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bcrochet merged 1 commit into from
Nov 11, 2025
Merged

fix git reconciler error: worktree contains unstaged changes #175

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions internal/reconcilers/pipeline_git_repo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,12 @@ func cloneOrPullRepo(targetPath string, pipelineRelease string) (string, error)
return "", err
}

// Reset the worktree to discard any local changes
// This avoids reconciliation errors when anything other than `main` is used in the CR
if err := w.Reset(&git.ResetOptions{Mode: git.HardReset}); err != nil {
return "", err
}

// Checking out the hash value of the branch/tag that was requested
if err := w.Checkout(&git.CheckoutOptions{Hash: ref.Hash()}); err != nil {
return "", err
Expand Down