fix: Use force checkouts in git artifact. Fixes argoproj#14141

DavidGamba · DavidGamba · commit 561af8c509b4 · 2025-02-03T09:50:23.000-07:00
Avoids worktree contains unstaged changes error

Signed-off-by: David Gamba &lt;davidgamba@gmail.com&gt;
diff --git a/workflow/artifacts/git/git.go b/workflow/artifacts/git/git.go
@@ -164,7 +164,7 @@ func (g *ArtifactDriver) Load(inputArtifact *wfv1.Artifact, path string) error {
 		if err != nil {
 			return fmt.Errorf("failed to get resolve revision: %w", err)
 		}
-		if err := w.Checkout(&git.CheckoutOptions{Hash: plumbing.NewHash(h.String())}); err != nil {
+		if err := w.Checkout(&git.CheckoutOptions{Hash: plumbing.NewHash(h.String()), Force: true}); err != nil {
 			return fmt.Errorf("failed to checkout %q: %w", h, err)
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@ func (g ArtifactDriver) Load(inputArtifact wfv1.Artifact, path string) error {`
`164`	`164`	`if err != nil {`
`165`	`165`	`return fmt.Errorf("failed to get resolve revision: %w", err)`
`166`	`166`	`}`
`167`		`- if err := w.Checkout(&git.CheckoutOptions{Hash: plumbing.NewHash(h.String())}); err != nil {`
	`167`	`+ if err := w.Checkout(&git.CheckoutOptions{Hash: plumbing.NewHash(h.String()), Force: true}); err != nil {`
`168`	`168`	`return fmt.Errorf("failed to checkout %q: %w", h, err)`
`169`	`169`	`}`
`170`	`170`	`}`