Use git domain types for default references

Since the main user of these constants is the default branch logic, we
might as well make them the proper types.

4 files changed, 12 insertions, 14 deletions

diff --git a/internal/git/localrepo/refs.go b/internal/git/localrepo/refs.go
index 6471513dc..29547f178 100644
--- a/internal/git/localrepo/refs.go
+++ b/internal/git/localrepo/refs.go
@@ -283,22 +283,20 @@ func (repo *Repo) GetDefaultBranch(ctx context.Context) (git.ReferenceName, erro
 		// If the ref pointed at by HEAD doesn't exist, the rev-parse fails
 		// returning the string `"HEAD"`
 		if headRef == "HEAD" {
-			defaultRef := git.ReferenceName(git.DefaultRef)
-			ok, err := repo.HasRevision(ctx, defaultRef.Revision())
+			ok, err := repo.HasRevision(ctx, git.DefaultRef.Revision())
 			if err != nil {
 				return "", err
 			}
 			if ok {
-				return defaultRef, nil
+				return git.DefaultRef, nil
 			}
 
-			legacyDefaultRef := git.ReferenceName(git.LegacyDefaultRef)
-			ok, err = repo.HasRevision(ctx, legacyDefaultRef.Revision())
+			ok, err = repo.HasRevision(ctx, git.LegacyDefaultRef.Revision())
 			if err != nil {
 				return "", err
 			}
 			if ok {
-				return legacyDefaultRef, nil
+				return git.LegacyDefaultRef, nil
 			}
 
 			return "", nil
diff --git a/internal/git/localrepo/refs_test.go b/internal/git/localrepo/refs_test.go
index 37b9aebe1..ee49415a5 100644
--- a/internal/git/localrepo/refs_test.go
+++ b/internal/git/localrepo/refs_test.go
@@ -471,7 +471,7 @@ func TestGetDefaultBranch(t *testing.T) {
 				gittest.WriteCommit(t, repo.cfg, repoPath, gittest.WithParents(oid), gittest.WithBranch("main"))
 				return repo
 			},
-			expectedName: git.ReferenceName(git.DefaultRef),
+			expectedName: git.DefaultRef,
 		},
 		{
 			desc: "legacy default ref",
@@ -481,7 +481,7 @@ func TestGetDefaultBranch(t *testing.T) {
 				gittest.WriteCommit(t, repo.cfg, repoPath, gittest.WithParents(oid), gittest.WithBranch("master"))
 				return repo
 			},
-			expectedName: git.ReferenceName(git.LegacyDefaultRef),
+			expectedName: git.LegacyDefaultRef,
 		},
 		{
 			desc: "no branches",
@@ -505,7 +505,7 @@ func TestGetDefaultBranch(t *testing.T) {
 				repo, _ := setupRepo(t, false)
 				return repo
 			},
-			expectedName: git.ReferenceName(git.LegacyDefaultRef),
+			expectedName: git.LegacyDefaultRef,
 		},
 		{
 			desc: "test repo HEAD set",
diff --git a/internal/git/repository.go b/internal/git/repository.go
index e5f5b25d5..fb3b6ef5d 100644
--- a/internal/git/repository.go
+++ b/internal/git/repository.go
@@ -13,12 +13,12 @@ const DefaultBranch = "main"
 
 // DefaultRef is the reference that GitLab will use if HEAD of the bare repository
 // is not found, or other edge cases to detect the default branch.
-var DefaultRef = []byte("refs/heads/" + DefaultBranch)
+const DefaultRef = ReferenceName("refs/heads/" + DefaultBranch)
 
 // LegacyDefaultRef is the reference that used to be the default HEAD of the bare
 // repository. If the default reference is not found, Gitaly will still test the
 // legacy default.
-var LegacyDefaultRef = []byte("refs/heads/master")
+const LegacyDefaultRef = ReferenceName("refs/heads/master")
 
 var (
 	// ErrReferenceNotFound represents an error when a reference was not
diff --git a/internal/gitaly/service/ref/refs_test.go b/internal/gitaly/service/ref/refs_test.go
index c3717957a..cbfb7383c 100644
--- a/internal/gitaly/service/ref/refs_test.go
+++ b/internal/gitaly/service/ref/refs_test.go
@@ -238,7 +238,7 @@ func TestSetDefaultBranchRef(t *testing.T) {
 		{
 			desc:        "unknown ref",
 			ref:         "refs/heads/non_existent_ref",
-			expectedRef: string(git.LegacyDefaultRef),
+			expectedRef: git.LegacyDefaultRef.String(),
 		},
 	}
 
@@ -271,7 +271,7 @@ func TestSuccessfulFindDefaultBranchName(t *testing.T) {
 	r, err := client.FindDefaultBranchName(ctx, rpcRequest)
 	require.NoError(t, err)
 
-	require.Equal(t, r.GetName(), git.DefaultRef)
+	require.Equal(t, r.GetName(), []byte(git.DefaultRef))
 }
 
 func TestSuccessfulFindDefaultBranchNameLegacy(t *testing.T) {
@@ -283,7 +283,7 @@ func TestSuccessfulFindDefaultBranchNameLegacy(t *testing.T) {
 	r, err := client.FindDefaultBranchName(ctx, rpcRequest)
 	require.NoError(t, err)
 
-	require.Equal(t, r.GetName(), git.LegacyDefaultRef)
+	require.Equal(t, r.GetName(), []byte(git.LegacyDefaultRef))
 }
 
 func TestEmptyFindDefaultBranchNameRequest(t *testing.T) {