diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2021-12-15 10:43:48 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2021-12-20 12:42:56 +0300 |
| commit | db2391fbbbf4ed41907196af412727655006a9df (patch) | |
| tree | 95e3f56661bea4bf47267ce368efed648ddc4413 | |
| parent | 34a4423240420ff268c8815b1b49c38032f9f035 (diff) | |
conflicts: Do not override hooks path
In the "conflicts" package, we're globally overriding the hooks path.
This isn't required though: the tests all work without this override.
| -rw-r--r-- | internal/gitaly/service/conflicts/testhelper_test.go | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/internal/gitaly/service/conflicts/testhelper_test.go b/internal/gitaly/service/conflicts/testhelper_test.go index 3cfe79f5e..5a4b9e885 100644 --- a/internal/gitaly/service/conflicts/testhelper_test.go +++ b/internal/gitaly/service/conflicts/testhelper_test.go @@ -19,10 +19,7 @@ import ( ) func TestMain(m *testing.M) { - testhelper.Run(m, testhelper.WithSetup(func() error { - config.OverrideHooksPath = "/" - return nil - })) + testhelper.Run(m) } func SetupConfigAndRepo(t testing.TB, bare bool) (config.Cfg, *gitalypb.Repository, string) { |