diff options
| author | Sami Hiltunen <shiltunen@gitlab.com> | 2020-09-15 10:47:44 +0300 |
|---|---|---|
| committer | Sami Hiltunen <shiltunen@gitlab.com> | 2020-09-15 10:47:44 +0300 |
| commit | 7f37ae4ae44823798a511038d0c4158dd3f98e77 (patch) | |
| tree | bf474251d0324fbe28cc371c3047af51de3b36ed /cmd/gitaly-git2go | |
| parent | faf3483ef1cc5d25ae455fba543c684cc7e486ef (diff) | |
| parent | cc4aedb869cad2ca0493ac0048d4dab16f140de0 (diff) | |
Merge branch 'ash2k/path-filepath' into 'master'
Use filepath package to manipulate file paths
See merge request gitlab-org/gitaly!2556
Diffstat (limited to 'cmd/gitaly-git2go')
| -rw-r--r-- | cmd/gitaly-git2go/merge_test.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd/gitaly-git2go/merge_test.go b/cmd/gitaly-git2go/merge_test.go index 1488ff59e..b0bf0c955 100644 --- a/cmd/gitaly-git2go/merge_test.go +++ b/cmd/gitaly-git2go/merge_test.go @@ -5,7 +5,7 @@ package main import ( "bytes" "os/exec" - "path" + "path/filepath" "strings" "testing" "time" @@ -40,7 +40,7 @@ func merge(t *testing.T, opts mergeSubcommand) (string, string, error) { args = append(args, arg, value) } - binary := path.Join(config.Config.BinDir, "gitaly-git2go") + binary := filepath.Join(config.Config.BinDir, "gitaly-git2go") ctx, cancel := testhelper.Context() defer cancel() |