Merge pull request fluxcd#988 from weaveworks/helm-operator-non-maste…

…r-clone-issue2

Fix for Helm operator non-master branch clone issue

integrations/helm/git/git.go

@@ -97,9 +97,10 @@ func (ch *Checkout) Clone(ctx context.Context, cloneSubdir string) error {
 	}
 	ch.Dir = repoDir
 
-	repo, err := gogit.PlainClone(repoDir, false, &gogit.CloneOptions{
-		URL:  ch.Config.URL,
-		Auth: ch.auth,
+	repo, err := gogit.PlainCloneContext(ctx, repoDir, false, &gogit.CloneOptions{
+		URL:           ch.Config.URL,
+		Auth:          ch.auth,
+		ReferenceName: plumbing.ReferenceName(fmt.Sprintf("refs/heads/%s", ch.Config.Branch)),
 	})
 	if err != nil {
 		return err
@@ -110,14 +111,6 @@ func (ch *Checkout) Clone(ctx context.Context, cloneSubdir string) error {
 		return err
 	}
 
-	br := ch.Config.Branch
-	err = wt.Checkout(&gogit.CheckoutOptions{
-		Branch: plumbing.ReferenceName(fmt.Sprintf("refs/heads/%s", br)),
-	})
-	if err != nil {
-		return err
-	}
-
 	ch.Repo = repo
 	ch.worktree = wt
 
@@ -181,8 +174,9 @@ func (ch *Checkout) Pull(ctx context.Context) error {
 		return ErrNoRepoCloned
 	}
 	err := w.Pull(&gogit.PullOptions{
-		RemoteName: "origin",
-		Auth:       ch.auth,
+		RemoteName:    "origin",
+		Auth:          ch.auth,
+		ReferenceName: plumbing.ReferenceName(fmt.Sprintf("refs/heads/%s", ch.Config.Branch)),
 	})
 	if err != nil && err != gogit.NoErrAlreadyUpToDate {
 		return err