diff options
Diffstat (limited to 'internal/git2go/command.go')
| -rw-r--r-- | internal/git2go/command.go | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/internal/git2go/command.go b/internal/git2go/command.go index c65665de1..c64b1c899 100644 --- a/internal/git2go/command.go +++ b/internal/git2go/command.go @@ -5,6 +5,7 @@ import ( "context" "encoding/base64" "encoding/json" + "errors" "fmt" "io" "os/exec" @@ -15,6 +16,11 @@ import ( "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" ) +var ( + // ErrInvalidArgument is returned in case the merge arguments are invalid. + ErrInvalidArgument = errors.New("invalid parameters") +) + func binaryPathFromCfg(cfg config.Cfg) string { return filepath.Join(cfg.BinDir, "gitaly-git2go") } |