fix: handle uninitialized repos without commits gracefully

Author: zhaochunqi

cmd/git.go

@@ -80,10 +80,21 @@ func convertToWebURL(url string) string {
 // getBranchNameFunc is a variable that can be replaced for testing
 var getBranchNameFunc = func(repo *git.Repository) (string, error) {
 	head, err := repo.Head()
-	if err != nil {
+	if err == nil {
+		return head.Name().Short(), nil
+	}
+
+	ref, refErr := repo.Reference("HEAD", true)
+	if refErr != nil {
 		return "", fmt.Errorf("error getting HEAD: %w", err)
 	}
-	return head.Name().Short(), nil
+
+	target := ref.Target()
+	if target.IsBranch() {
+		return target.Short(), nil
+	}
+
+	return "", fmt.Errorf("error getting HEAD: %w", err)
 }
 
 func getBranchName(repo *git.Repository) (string, error) {

cmd/git_test.go

@@ -249,11 +249,22 @@ func Test_getBranchName(t *testing.T) {
 			branchName: "feature-branch",
 			wantErr:    false,
 		},
+		{
+			name:       "uninitialized repo with HEAD reference",
+			remoteURL:  "https://github.com/zhaochunqi/git-open.git",
+			branchName: "main",
+			wantErr:    true, // Expect error when there's no commit
+		},
 	}
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			_, cleanup := testhelper.SetupTestRepo(t, tt.remoteURL, tt.branchName)
+			var cleanup func()
+			if tt.name == "uninitialized repo with HEAD reference" {
+				_, cleanup = testhelper.SetupTestRepoWithoutCommit(t, tt.remoteURL, tt.branchName)
+			} else {
+				_, cleanup = testhelper.SetupTestRepo(t, tt.remoteURL, tt.branchName)
+			}
 			defer cleanup()
 
 			repo, err := getCurrentGitDirectory()

cmd/root.go

@@ -40,14 +40,12 @@ and converts it to a web URL. The web URL is then printed to the console.`,
 		}
 
 		branchName, err := getBranchName(repo)
-		if err != nil {
-			return fmt.Errorf("error getting branch name: %w", err)
-		}
-
-		// For now, we only append branch name if it's not 'main' or 'master'.
-		// This can be improved later to fetch default branch from remote or allow configuration.
-		if branchName != "main" && branchName != "master" {
-			webURL = buildBranchURL(webURL, branchName, remoteURL)
+		if err == nil {
+			// For now, we only append branch name if it's not 'main' or 'master'.
+			// This can be improved later to fetch default branch from remote or allow configuration.
+			if branchName != "main" && branchName != "master" {
+				webURL = buildBranchURL(webURL, branchName, remoteURL)
+			}
 		}
 
 		err = openURLInBrowserFunc(webURL)

cmd/root_test.go

@@ -289,7 +289,7 @@ func Test_rootCmd_ErrorHandling(t *testing.T) {
 					return "", errors.New("branch name error")
 				}
 			},
-			wantErr: true,
+			wantErr: false, // Branch name error should not cause command to fail, opens main page
 		},
 		{
 			name: "browser error",

internal/testhelper/git.go

@@ -104,3 +104,74 @@ func SetupTestRepo(t *testing.T, remoteURL string, branchName string) (string, f
 
 	return tmpDir, cleanup
 }
+
+// SetupTestRepoWithoutCommit creates a temporary git repository without any commits.
+// It returns the temporary directory path and a cleanup function.
+func SetupTestRepoWithoutCommit(t *testing.T, remoteURL string, branchName string) (string, func()) {
+	t.Helper()
+
+	// Create temporary directory
+	tmpDir, err := os.MkdirTemp("", "git-test-no-commit")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// Initialize git repository
+	repo, err := git.PlainInit(tmpDir, false)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// Add remote if URL is provided
+	if remoteURL != "" {
+		_, err = repo.CreateRemote(&config.RemoteConfig{
+			Name: "origin",
+			URLs: []string{remoteURL},
+		})
+		if err != nil {
+			t.Fatal(err)
+		}
+	}
+
+	// Create a worktree and add a file (but don't commit)
+	w, err := repo.Worktree()
+	if err != nil {
+		t.Fatal(err)
+	}
+	err = os.WriteFile(filepath.Join(tmpDir, "test.txt"), []byte("hello"), 0644)
+	if err != nil {
+		t.Fatal(err)
+	}
+	_, err = w.Add("test.txt")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// Create a symbolic reference for HEAD to point to the specified branch
+	if branchName != "" {
+		headRef := plumbing.NewSymbolicReference(plumbing.HEAD, plumbing.ReferenceName("refs/heads/"+branchName))
+		err = repo.Storer.SetReference(headRef)
+		if err != nil {
+			t.Fatal(err)
+		}
+	}
+
+	// Save current directory
+	currentDir, err := os.Getwd()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// Change to test directory
+	if err := os.Chdir(tmpDir); err != nil {
+		t.Fatal(err)
+	}
+
+	// Return cleanup function
+	cleanup := func() {
+		os.Chdir(currentDir)
+		os.RemoveAll(tmpDir)
+	}
+
+	return tmpDir, cleanup
+}