fix(repositories): reset if repo has diverged (#3210)

ovh · Aug 17, 2018 · b4873be · b4873be
1 parent b23f879
commit b4873be
Show file tree

Hide file tree

Showing 13 changed files with 2,717 additions and 595 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/engine/repositories/processor_checkout.go b/engine/repositories/processor_checkout.go
@@ -56,6 +56,20 @@ func (s *Service) processCheckout(op *sdk.Operation) error {
 		return err
 	}
 
+	//Check is repo has diverged
+	hasDiverged, err := gitRepo.HasDiverged()
+	if err != nil {
+		log.Error("Repositories> processCheckout> HasDiverged> [%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 = d
 	}

diff --git a/vendor/github.com/fsamin/go-repo/repo.go b/vendor/github.com/fsamin/go-repo/repo.go
diff --git a/vendor/github.com/spf13/cobra/cobra/cmd/license_agpl.go b/vendor/github.com/spf13/cobra/cobra/cmd/license_agpl.go
diff --git a/vendor/github.com/spf13/cobra/cobra/cmd/license_apache_2.go b/vendor/github.com/spf13/cobra/cobra/cmd/license_apache_2.go
diff --git a/vendor/github.com/spf13/cobra/cobra/cmd/license_bsd_clause_2.go b/vendor/github.com/spf13/cobra/cobra/cmd/license_bsd_clause_2.go