diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2024-01-11 10:05:24 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2024-01-11 10:05:24 +0300 |
| commit | 7266ae482ea8dd634a39d3607fbb9b8647b63f3e (patch) | |
| tree | 73edfda7212e3b2c6f369fdad59e34ca7b15e5e0 /internal/gitaly/storage/storagemgr/transaction_manager_default_branch_test.go | |
| parent | 3cef841313043732f7003229d6cfda487ad43d79 (diff) | |
| parent | e723389f79dea270432590bbb1cb68a5f8df5b87 (diff) | |
Automatic merge of gitlab-org/gitaly master
Diffstat (limited to 'internal/gitaly/storage/storagemgr/transaction_manager_default_branch_test.go')
| -rw-r--r-- | internal/gitaly/storage/storagemgr/transaction_manager_default_branch_test.go | 44 |
1 files changed, 29 insertions, 15 deletions
diff --git a/internal/gitaly/storage/storagemgr/transaction_manager_default_branch_test.go b/internal/gitaly/storage/storagemgr/transaction_manager_default_branch_test.go index 200877c9a..e77094fbf 100644 --- a/internal/gitaly/storage/storagemgr/transaction_manager_default_branch_test.go +++ b/internal/gitaly/storage/storagemgr/transaction_manager_default_branch_test.go @@ -42,9 +42,11 @@ func generateDefaultBranchTests(t *testing.T, setup testTransactionSetup) []tran Repositories: RepositoryStates{ setup.RelativePath: { DefaultBranch: "refs/heads/branch2", - References: []git.Reference{ - {Name: "refs/heads/branch2", Target: setup.Commits.First.OID.String()}, - {Name: "refs/heads/main", Target: setup.Commits.First.OID.String()}, + References: &ReferencesState{ + LooseReferences: map[git.ReferenceName]git.ObjectID{ + "refs/heads/branch2": setup.Commits.First.OID, + "refs/heads/main": setup.Commits.First.OID, + }, }, }, }, @@ -87,9 +89,11 @@ func generateDefaultBranchTests(t *testing.T, setup testTransactionSetup) []tran Repositories: RepositoryStates{ setup.RelativePath: { DefaultBranch: "refs/heads/branch2", - References: []git.Reference{ - {Name: "refs/heads/branch2", Target: setup.Commits.First.OID.String()}, - {Name: "refs/heads/main", Target: setup.Commits.Second.OID.String()}, + References: &ReferencesState{ + LooseReferences: map[git.ReferenceName]git.ObjectID{ + "refs/heads/branch2": setup.Commits.First.OID, + "refs/heads/main": setup.Commits.Second.OID, + }, }, }, }, @@ -138,7 +142,11 @@ func generateDefaultBranchTests(t *testing.T, setup testTransactionSetup) []tran Repositories: RepositoryStates{ setup.RelativePath: { DefaultBranch: "refs/heads/non-existent", - References: []git.Reference{{Name: "refs/heads/main", Target: setup.Commits.First.OID.String()}}, + References: &ReferencesState{ + LooseReferences: map[git.ReferenceName]git.ObjectID{ + "refs/heads/main": setup.Commits.First.OID, + }, + }, }, }, }, @@ -195,8 +203,10 @@ func generateDefaultBranchTests(t *testing.T, setup testTransactionSetup) []tran Repositories: RepositoryStates{ setup.RelativePath: { DefaultBranch: "refs/heads/branch2", - References: []git.Reference{ - {Name: "refs/heads/main", Target: setup.Commits.First.OID.String()}, + References: &ReferencesState{ + LooseReferences: map[git.ReferenceName]git.ObjectID{ + "refs/heads/main": setup.Commits.First.OID, + }, }, }, }, @@ -239,9 +249,11 @@ func generateDefaultBranchTests(t *testing.T, setup testTransactionSetup) []tran Repositories: RepositoryStates{ setup.RelativePath: { DefaultBranch: "refs/heads/branch2", - References: []git.Reference{ - {Name: "refs/heads/branch2", Target: setup.Commits.First.OID.String()}, - {Name: "refs/heads/main", Target: setup.Commits.Second.OID.String()}, + References: &ReferencesState{ + LooseReferences: map[git.ReferenceName]git.ObjectID{ + "refs/heads/branch2": setup.Commits.First.OID, + "refs/heads/main": setup.Commits.Second.OID, + }, }, }, }, @@ -296,9 +308,11 @@ func generateDefaultBranchTests(t *testing.T, setup testTransactionSetup) []tran Repositories: RepositoryStates{ setup.RelativePath: { DefaultBranch: "refs/heads/branch2", - References: []git.Reference{ - {Name: "refs/heads/branch2", Target: setup.Commits.First.OID.String()}, - {Name: "refs/heads/main", Target: setup.Commits.Second.OID.String()}, + References: &ReferencesState{ + LooseReferences: map[git.ReferenceName]git.ObjectID{ + "refs/heads/main": setup.Commits.Second.OID, + "refs/heads/branch2": setup.Commits.First.OID, + }, }, }, }, |