diff --git a/engine/repositories/processor_checkout.go b/engine/repositories/processor_checkout.go index 70edfcd5d5..a75bf30cc1 100644 --- a/engine/repositories/processor_checkout.go +++ b/engine/repositories/processor_checkout.go @@ -11,20 +11,11 @@ func (s *Service) processCheckout(op *sdk.Operation) error { return sdk.WrapError(err, "unable to process gitclone") } - //Check is repo has diverged - hasDiverged, err := gitRepo.HasDiverged() - if err != nil { - log.Error("Repositories> processCheckout> HasDiverged> [%s] Error: %v", op.UUID, err) + if err := gitRepo.ResetHard("origin/" + currentBranch); err != nil { + log.Error("Repositories> processCheckout> ResetHard> [%s] Error: %v", op.UUID, err) return err } - if hasDiverged { - if err := gitRepo.ResetHard("origin/" + currentBranch); err != nil { - log.Error("Repositories> processCheckout> ResetHard> [%s] Error: %v", op.UUID, err) - return err - } - } - if op.Setup.Checkout.Branch == "" { op.Setup.Checkout.Branch = op.RepositoryInfo.DefaultBranch }