diff options
| author | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2021-06-30 17:12:47 +0300 |
|---|---|---|
| committer | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2021-06-30 17:12:47 +0300 |
| commit | 35f931e7acbaaede52c39537f2d47b06a4c95ea7 (patch) | |
| tree | f306608e46acc2c2b185df0c577a8baaefa345ee | |
| parent | 892d338020c6113840d79e61cabd492abaffbd62 (diff) | |
| parent | 426a4804b4b6e9773ababea19237e11b0e24896e (diff) | |
Merge branch 'pks-resolve-conflicts-test-style' into 'master'
conflicts: Fix ResolveConflicts test breaking linter
See merge request gitlab-org/gitaly!3633
| -rw-r--r-- | internal/gitaly/service/conflicts/resolve_conflicts_test.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/internal/gitaly/service/conflicts/resolve_conflicts_test.go b/internal/gitaly/service/conflicts/resolve_conflicts_test.go index 9b90a6ef6..5c471dbef 100644 --- a/internal/gitaly/service/conflicts/resolve_conflicts_test.go +++ b/internal/gitaly/service/conflicts/resolve_conflicts_test.go @@ -138,7 +138,7 @@ func testSuccessfulResolveConflictsRequestHelper(t *testing.T, ctx context.Conte pattern := fmt.Sprintf("%s .* refs/heads/%s\n", ourCommitOID, sourceBranch) require.Regexp(t, regexp.MustCompile(pattern), string(changes)) require.Empty(t, pushOptions) - hookCount += 1 + hookCount++ return nil } |