fix: multi-gitter does now only fetch the base and head branch

lindell · Jan 16, 2021 · b272644 · b272644
1 parent e30c408
commit b272644
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 6 deletions.
diff --git a/internal/git/git.go b/internal/git/git.go
@@ -6,6 +6,7 @@ import (
 	"net/url"
 	"time"
 
+	"github.com/go-git/go-git/v5/config"
 	"github.com/go-git/go-git/v5/plumbing/object"
 	"github.com/lindell/multi-gitter/internal/domain"
 	"github.com/pkg/errors"
@@ -24,8 +25,10 @@ type Git struct {
 	repo *git.Repository // The repository after the clone has been made
 }
 
+const fetchDepth = 10
+
 // Clone a repository
-func (g *Git) Clone(branchName string) error {
+func (g *Git) Clone(baseName, headName string) error {
 	u, err := url.Parse(g.Repo)
 	if err != nil {
 		return err
@@ -34,12 +37,28 @@ func (g *Git) Clone(branchName string) error {
 	r, err := git.PlainClone(g.Directory, false, &git.CloneOptions{
 		URL:           u.String(),
 		RemoteName:    "origin",
-		Depth:         10,
-		ReferenceName: plumbing.NewBranchReferenceName(branchName),
+		Depth:         fetchDepth,
+		ReferenceName: plumbing.NewBranchReferenceName(baseName),
+		SingleBranch:  true,
 	})
 	if err != nil {
 		return errors.Wrap(err, "could not clone from the remote")
 	}
+
+	if headName != "" {
+		err = r.Fetch(&git.FetchOptions{
+			RefSpecs: []config.RefSpec{
+				config.RefSpec(fmt.Sprintf("refs/heads/%s:refs/remotes/origin/%s", headName, headName)),
+			},
+			Depth: fetchDepth,
+		})
+		if err != nil {
+			if _, ok := err.(git.NoMatchingRefSpecError); !ok {
+				return err
+			}
+		}
+	}
+
 	g.repo = r
 
 	return nil

diff --git a/internal/multigitter/print.go b/internal/multigitter/print.go
@@ -81,7 +81,7 @@ func (r Printer) runSingleRepo(ctx context.Context, repo domain.Repository) erro
 		Repo:      repo.URL(r.Token),
 	}
 
-	err = sourceController.Clone(repo.DefaultBranch())
+	err = sourceController.Clone(repo.DefaultBranch(), "")
 	if err != nil {
 		return err
 	}

diff --git a/internal/multigitter/run.go b/internal/multigitter/run.go
@@ -135,7 +135,7 @@ func (r Runner) runSingleRepo(ctx context.Context, repo domain.Repository) error
 		baseBranch = repo.DefaultBranch()
 	}
 
-	err = sourceController.Clone(baseBranch)
+	err = sourceController.Clone(baseBranch, r.FeatureBranch)
 	if err != nil {
 		return err
 	}

diff --git a/tests/table_test.go b/tests/table_test.go
@@ -113,7 +113,7 @@ func TestTable(t *testing.T) {
 			},
 			verify: func(t *testing.T, vcMock *vcmock.VersionController, runData runData) {
 				require.Len(t, vcMock.PullRequests, 0)
-				assert.Contains(t, runData.logOut, `msg="could not clone from the remote: reference not found"`)
+				assert.Contains(t, runData.logOut, `msg="could not clone from the remote: couldn't find remote ref \"refs/heads/custom-base-branch\""`)
 			},
 		},