fix: In addition to ErrWorktreeNotClean the ErrUnstagedChanges handle…

…d as well.
grafana · Sep 10, 2024 · d851d0e · d851d0e
1 parent 55f8de1
commit d851d0e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/cmd/lint.go b/cmd/lint.go
@@ -94,7 +94,7 @@ func updateWorkdir(ctx context.Context, dir string, cloneURL string) error {
 
 	err = wtree.Pull(&git.PullOptions{Force: true})
 	if err != nil && !errors.Is(err, git.NoErrAlreadyUpToDate) {
-		if !errors.Is(err, git.ErrWorktreeNotClean) {
+		if !errors.Is(err, git.ErrWorktreeNotClean) && !errors.Is(err, git.ErrUnstagedChanges) {
 			return err
 		}
 

diff --git a/releases/v0.1.22.md b/releases/v0.1.22.md
@@ -0,0 +1,9 @@
+k6registry `v0.1.22` is here 🎉!
+
+This is an internal maintenance release.
+
+**Retry git pull on error**
+
+In the git working directory, the file permissions are changed to make the cache persistent in GitHub action mode. As a consequence, the git pull operation will fail (if permissions have actually been changed).
+
+To fix this, if the pull operation fails, the pull operation is repeated after a forced checkout operation.