diff options
Diffstat (limited to 'internal/gitaly/service/conflicts/testhelper_test.go')
| -rw-r--r-- | internal/gitaly/service/conflicts/testhelper_test.go | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/internal/gitaly/service/conflicts/testhelper_test.go b/internal/gitaly/service/conflicts/testhelper_test.go index 853a0581e..60f59c18b 100644 --- a/internal/gitaly/service/conflicts/testhelper_test.go +++ b/internal/gitaly/service/conflicts/testhelper_test.go @@ -2,7 +2,6 @@ package conflicts import ( "context" - "path/filepath" "testing" "gitlab.com/gitlab-org/gitaly/v14/internal/git/gittest" @@ -24,7 +23,7 @@ func TestMain(m *testing.M) { testhelper.Run(m) } -func SetupConflictsService(ctx context.Context, t testing.TB, bare bool, hookManager hook.Manager) (config.Cfg, *gitalypb.Repository, string, gitalypb.ConflictsServiceClient) { +func setupConflictsService(ctx context.Context, t testing.TB, hookManager hook.Manager) (config.Cfg, *gitalypb.Repository, string, gitalypb.ConflictsServiceClient) { cfg := testcfg.Build(t) testcfg.BuildGitalyGit2Go(t, cfg) @@ -39,14 +38,6 @@ func SetupConflictsService(ctx context.Context, t testing.TB, bare bool, hookMan Seed: gittest.SeedGitLabTest, }) - if !bare { - gittest.AddWorktree(t, cfg, repoPath, "worktree") - repoPath = filepath.Join(repoPath, "worktree") - // AddWorktree creates a detached worktree. Checkout master here so the - // branch pointer moves as we later commit. - gittest.Exec(t, cfg, "-C", repoPath, "checkout", "master") - } - return cfg, repo, repoPath, client } |