fix(cli): checkout working tree after gt clone

Co-authored-by: factory-droid[bot] <138933559+factory-droid[bot]@users.noreply.github.com>

Author: Patel230

internal/cli/clone.go

@@ -16,12 +16,9 @@ func Clone(daemonURL, repoID, localPath string) error {
 
 	// Get repo info with refs
 	var repoInfo struct {
-		ID   string `json:"id"`
-		Name string `json:"name"`
-		Refs []struct {
-			Name string `json:"name"`
-			Hash string `json:"hash"`
-		} `json:"refs"`
+		ID   string     `json:"id"`
+		Name string     `json:"name"`
+		Refs []cloneRef `json:"refs"`
 	}
 	if err := client.Get(fmt.Sprintf("/api/v1/repos/%s/clone", url.PathEscape(repoID)), &repoInfo); err != nil {
 		return fmt.Errorf("fetching repo info: %w", err)
@@ -50,10 +47,49 @@ func Clone(daemonURL, repoID, localPath string) error {
 		}
 	}
 
+	checkoutRef := defaultCheckoutRef(repoInfo.Refs)
+	if checkoutRef != "" {
+		if err := repo.Storer.SetReference(plumbing.NewSymbolicReference(plumbing.HEAD, checkoutRef)); err != nil {
+			return fmt.Errorf("setting HEAD to %s: %w", checkoutRef, err)
+		}
+		worktree, err := repo.Worktree()
+		if err != nil {
+			return fmt.Errorf("opening worktree: %w", err)
+		}
+		if err := worktree.Checkout(&git.CheckoutOptions{Branch: checkoutRef, Force: true}); err != nil {
+			return fmt.Errorf("checking out %s: %w", checkoutRef, err)
+		}
+	}
+
 	_, _ = fmt.Fprintf(Stderr(), "Cloned %s to %s (%d refs, %d objects)\n", repoID, localPath, len(repoInfo.Refs), len(seen))
 	return nil
 }
 
+type cloneRef struct {
+	Name string `json:"name"`
+	Hash string `json:"hash"`
+}
+
+func defaultCheckoutRef(refs []cloneRef) plumbing.ReferenceName {
+	for _, ref := range refs {
+		if ref.Name == "refs/heads/main" {
+			return plumbing.ReferenceName(ref.Name)
+		}
+	}
+	for _, ref := range refs {
+		if ref.Name == "refs/heads/master" {
+			return plumbing.ReferenceName(ref.Name)
+		}
+	}
+	for _, ref := range refs {
+		refName := plumbing.ReferenceName(ref.Name)
+		if refName.IsBranch() {
+			return refName
+		}
+	}
+	return ""
+}
+
 // fetchObjectRecursive fetches an object and all its children
 func fetchObjectRecursive(client *Client, repoID string, repo *git.Repository, hashStr string, seen map[string]bool, depth int) error {
 	if depth > 1000 {
@@ -154,10 +190,7 @@ func Pull(repoPath, daemonURL, repoID string) error {
 	client := NewClient(daemonURL)
 
 	var repoInfo struct {
-		Refs []struct {
-			Name string `json:"name"`
-			Hash string `json:"hash"`
-		} `json:"refs"`
+		Refs []cloneRef `json:"refs"`
 	}
 	if err := client.Get(fmt.Sprintf("/api/v1/repos/%s/clone", url.PathEscape(repoID)), &repoInfo); err != nil {
 		return fmt.Errorf("fetching remote refs: %w", err)

internal/cli/clone_test.go

@@ -0,0 +1,54 @@
+package cli
+
+import (
+	"testing"
+
+	"github.com/go-git/go-git/v6/plumbing"
+)
+
+func TestDefaultCheckoutRef(t *testing.T) {
+	tests := []struct {
+		name string
+		refs []cloneRef
+		want plumbing.ReferenceName
+	}{
+		{
+			name: "prefers main",
+			refs: []cloneRef{
+				{Name: "refs/heads/feature", Hash: "1111111111111111111111111111111111111111"},
+				{Name: "refs/heads/main", Hash: "2222222222222222222222222222222222222222"},
+				{Name: "refs/heads/master", Hash: "3333333333333333333333333333333333333333"},
+			},
+			want: "refs/heads/main",
+		},
+		{
+			name: "falls back to master",
+			refs: []cloneRef{
+				{Name: "refs/tags/v1", Hash: "1111111111111111111111111111111111111111"},
+				{Name: "refs/heads/master", Hash: "2222222222222222222222222222222222222222"},
+			},
+			want: "refs/heads/master",
+		},
+		{
+			name: "falls back to first branch",
+			refs: []cloneRef{
+				{Name: "refs/tags/v1", Hash: "1111111111111111111111111111111111111111"},
+				{Name: "refs/heads/feature", Hash: "2222222222222222222222222222222222222222"},
+			},
+			want: "refs/heads/feature",
+		},
+		{
+			name: "no branches",
+			refs: []cloneRef{{Name: "refs/tags/v1", Hash: "1111111111111111111111111111111111111111"}},
+			want: "",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := defaultCheckoutRef(tt.refs); got != tt.want {
+				t.Fatalf("defaultCheckoutRef() = %q, want %q", got, tt.want)
+			}
+		})
+	}
+}