diff options
Diffstat (limited to 'internal/git2go')
| -rw-r--r-- | internal/git2go/apply_test.go | 3 | ||||
| -rw-r--r-- | internal/git2go/commit_test.go | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/internal/git2go/apply_test.go b/internal/git2go/apply_test.go index 1744432b6..fe12d603d 100644 --- a/internal/git2go/apply_test.go +++ b/internal/git2go/apply_test.go @@ -8,7 +8,6 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/command" "gitlab.com/gitlab-org/gitaly/internal/git" "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" "gitlab.com/gitlab-org/gitaly/internal/testhelper" @@ -19,7 +18,7 @@ func TestExecutor_Apply(t *testing.T) { defer clean() repo := git.NewRepository(pbRepo) - executor := New(filepath.Join(config.Config.BinDir, "gitaly-git2go"), command.GitPath()) + executor := New(filepath.Join(config.Config.BinDir, "gitaly-git2go"), config.Config.Git.BinPath) ctx, cancel := testhelper.Context() defer cancel() diff --git a/internal/git2go/commit_test.go b/internal/git2go/commit_test.go index 0fbe24bd7..215cc59da 100644 --- a/internal/git2go/commit_test.go +++ b/internal/git2go/commit_test.go @@ -13,7 +13,6 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/command" "gitlab.com/gitlab-org/gitaly/internal/git" "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" "gitlab.com/gitlab-org/gitaly/internal/testhelper" @@ -64,7 +63,7 @@ func TestExecutor_Commit(t *testing.T) { updatedFile, err := repo.WriteBlob(ctx, "file", bytes.NewBufferString("updated")) require.NoError(t, err) - executor := New(filepath.Join(config.Config.BinDir, "gitaly-git2go"), command.GitPath()) + executor := New(filepath.Join(config.Config.BinDir, "gitaly-git2go"), config.Config.Git.BinPath) for _, tc := range []struct { desc string |