diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2021-07-19 09:56:19 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2021-07-20 09:48:15 +0300 |
| commit | ec032565549010b95e639f21f717b0a0340cf32a (patch) | |
| tree | 2df5e2e2636a7a0ca821bf1958fca25e6f8cbf48 /.golangci.yml | |
| parent | 819774300da6567726c3d9022fe0c20a12cb795e (diff) | |
git2go: Implement conflicts on top of the executor
We're about to extend dependencies required to run gitaly-git2go
subcommands, which will make calling them tedious. This commit thus
refactors the conflicts subcommand to be implemented on top of the
`Executor` structure, which encapsulates all required dependencies and
thus avoids the additional complexity.
Diffstat (limited to '.golangci.yml')
| -rw-r--r-- | .golangci.yml | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/.golangci.yml b/.golangci.yml index 70ed969e9..4a00476a0 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -105,10 +105,6 @@ issues: text: "exported function `InitContextStats` should have comment or be unexported" - linters: - golint - path: "internal/git2go/conflicts.go" - text: "exported type `ConflictError` should have comment or be unexported" - - linters: - - golint path: "internal/git2go/revert.go" text: "exported type `RevertConflictError` should have comment or be unexported" - linters: |