fix(repositories): always reset hard (#4282)

Signed-off-by: Yvonnick Esnault <yvonnick.esnault@corp.ovh.com>
ovh · May 13, 2019 · e81e4cb · e81e4cb
1 parent 432ccee
commit e81e4cb
Showing 1 changed file with 2 additions and 11 deletions.
diff --git 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
 	}