Skip to content

fix(repository): immediately re-clone on pull failure #844

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

Closed
arnaud-dezandee wants to merge 1 commit into from
Closed

fix(repository): immediately re-clone on pull failure #844

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
11 changes: 9 additions & 2 deletions internal/repository/providers/standard/repository.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,10 @@ func getRemoteReferenceName(ref string) plumbing.ReferenceName {
}

func (p *GitProvider) Bundle(ref string) ([]byte, error) {
return p.bundleWithRetry(ref, false)
}

func (p *GitProvider) bundleWithRetry(ref string, isRetry bool) ([]byte, error) {
// Clone repository if it doesn't exist
if p.gitRepository == nil {
if err := p.clone(); err != nil {
Expand Down Expand Up @@ -140,12 +144,15 @@ func (p *GitProvider) Bundle(ref string) ([]byte, error) {
if err == git.NoErrAlreadyUpToDate {
log.Info("repository is already up-to-date")
} else {
log.Warnf("failed to pull latest changes for ref %s: %v, deleting local repository", reference.Name(), err)
if isRetry {
return nil, fmt.Errorf("failed to pull latest changes for ref %s after re-clone: %w", reference.Name(), err)
}
log.Warnf("failed to pull latest changes for ref %s: %v, deleting local repository and re-cloning", reference.Name(), err)
p.gitRepository = nil
if removeErr := os.RemoveAll(p.repositoryPath); removeErr != nil {
return nil, fmt.Errorf("failed to remove repository at %s: %w", p.repositoryPath, removeErr)
}
return nil, fmt.Errorf("failed to pull latest changes for ref %s: %w, likely because of force-push, next run will re-clone", reference.Name(), err)
return p.bundleWithRetry(ref, true)
}
}

Expand Down