Skip to content

fix: streamline repo cloning logic in gitutil.go #9891

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: streamline repo cloning logic in gitutil.go #9891

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5dc5b09
fix: streamline repo cloning logic in gitutil.go
idsulik Oct 18, 2025
05623cc
handle partial directory removal during repo cloning in gitutil.go
idsulik Oct 18, 2025
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
26 changes: 13 additions & 13 deletions pkg/skaffold/git/gitutil.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,21 +125,21 @@ func syncRepo(ctx context.Context, g Config, opts config.SkaffoldOptions) (strin
return "", SyncDisabledErr(g, repoCacheDir)
}
if _, err := r.Run(ctx, "clone", g.RepoCloneURI, fmt.Sprintf("./%s", hash), "--branch", ref, "--depth", "1"); err != nil {
if strings.Contains(err.Error(), "Could not find remote branch") {
if _, err := r.Run(ctx, "clone", g.RepoCloneURI, fmt.Sprintf("./%s", hash), "--depth", "1"); err != nil {
return "", fmt.Errorf("failed to clone repo: %w", err)
}

r.Dir = repoCacheDir
if _, err := r.Run(ctx, "checkout", ref); err != nil {
if rmErr := os.RemoveAll(repoCacheDir); rmErr != nil {
err = fmt.Errorf("failed to remove repo cache dir: %w", rmErr)
}
// Remove partially created directory before attempting full clone
if rmErr := os.RemoveAll(repoCacheDir); rmErr != nil {
return "", fmt.Errorf("failed to remove partially created repo directory: %w", rmErr)
}
if _, err := r.Run(ctx, "clone", g.RepoCloneURI, fmt.Sprintf("./%s", hash)); err != nil {
return "", fmt.Errorf("failed to clone repo: %w", err)
}

return "", fmt.Errorf("failed to checkout commit: %w", err)
r.Dir = repoCacheDir
if _, err := r.Run(ctx, "checkout", ref); err != nil {
if rmErr := os.RemoveAll(repoCacheDir); rmErr != nil {
err = fmt.Errorf("failed to remove repo cache dir: %w", rmErr)
}
} else {
return "", fmt.Errorf("failed to clone repo: %w", err)

return "", fmt.Errorf("failed to checkout commit: %w", err)
}
}
} else {
Expand Down