fix: migrate as code default branch (#4478)

ovh · Jul 22, 2019 · d1bc77d · d1bc77d
1 parent 7437ccc
commit d1bc77d
Showing 1 changed file with 6 additions and 13 deletions.
diff --git a/engine/repositories/processor_push.go b/engine/repositories/processor_push.go
@@ -17,19 +17,6 @@ func (s *Service) processPush(op *sdk.Operation) error {
 	if err != nil {
 		return sdk.WrapError(err, "unable to process gitclone")
 	}
-	//Check is repo has diverged
-	hasDiverged, err := gitRepo.HasDiverged()
-	if err != nil {
-		log.Error("Repositories> processPush> HasDiverged> [%s] Error: %v", op.UUID, err)
-		return sdk.WrapError(err, "HasDiverged> [%s] Error: %v", op.UUID, err)
-	}
-
-	if hasDiverged {
-		if err := gitRepo.ResetHard("origin/" + currentBranch); err != nil {
-			log.Error("Repositories> processPush> ResetHard> [%s] Error: %v", op.UUID, err)
-			return sdk.WrapError(err, "ResetHard> [%s] Error: %v", op.UUID, err)
-		}
-	}
 
 	if op.Setup.Push.ToBranch == "" {
 		op.Setup.Push.ToBranch = op.RepositoryInfo.DefaultBranch
@@ -43,6 +30,12 @@ func (s *Service) processPush(op *sdk.Operation) error {
 		}
 	}
 
+	// Reset hard default branch
+	if err := gitRepo.ResetHard("origin/" + op.RepositoryInfo.DefaultBranch); err != nil {
+		log.Error("Repositories> processPush> ResetHard> [%s] Error: %v", op.UUID, err)
+		return err
+	}
+
 	// Create new branch
 	if err := gitRepo.CheckoutNewBranch(op.Setup.Push.FromBranch); err != nil {
 		log.Error("Repositories> processPush> Create new branch %s> [%s] error %v", op.Setup.Push.FromBranch, op.UUID, err)