diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2020-12-07 15:34:13 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2020-12-09 12:50:01 +0300 |
| commit | 9ad74f21458dea14d591097b4b5332f7627111da (patch) | |
| tree | 176f6221256ab3751c35e55ca1c3ed48d8657251 | |
| parent | c0ea152ccad891cda5fd255c1fea78562aae5e4a (diff) | |
git: Move housekeeping into git package
In `internal/helper/housekeeping`, we have a set of functions to perform
housekeeping paths for Git repositories. Having it as a helper package
doesn't really make it that discoverable in the context of Git
repositories, so let's instead move the package into `internal/git`.
| -rw-r--r-- | internal/git/housekeeping/housekeeping.go (renamed from internal/helper/housekeeping/housekeeping.go) | 0 | ||||
| -rw-r--r-- | internal/git/housekeeping/housekeeping_test.go (renamed from internal/helper/housekeeping/housekeeping_test.go) | 0 | ||||
| -rw-r--r-- | internal/gitaly/service/repository/gc.go | 2 | ||||
| -rw-r--r-- | internal/gitaly/service/repository/rebase_in_progress.go | 2 | ||||
| -rw-r--r-- | internal/tempdir/tempdir.go | 2 |
5 files changed, 3 insertions, 3 deletions
diff --git a/internal/helper/housekeeping/housekeeping.go b/internal/git/housekeeping/housekeeping.go index 7dfc57c60..7dfc57c60 100644 --- a/internal/helper/housekeeping/housekeeping.go +++ b/internal/git/housekeeping/housekeeping.go diff --git a/internal/helper/housekeeping/housekeeping_test.go b/internal/git/housekeeping/housekeeping_test.go index 4077c9f9c..4077c9f9c 100644 --- a/internal/helper/housekeeping/housekeeping_test.go +++ b/internal/git/housekeeping/housekeeping_test.go diff --git a/internal/gitaly/service/repository/gc.go b/internal/gitaly/service/repository/gc.go index 469f18cea..28528e9b1 100644 --- a/internal/gitaly/service/repository/gc.go +++ b/internal/gitaly/service/repository/gc.go @@ -12,9 +12,9 @@ import ( log "github.com/sirupsen/logrus" "gitlab.com/gitlab-org/gitaly/internal/git" "gitlab.com/gitlab-org/gitaly/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/internal/git/housekeeping" "gitlab.com/gitlab-org/gitaly/internal/git/stats" "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/helper/housekeeping" "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/repository/rebase_in_progress.go b/internal/gitaly/service/repository/rebase_in_progress.go index b72ead574..2ad901b8c 100644 --- a/internal/gitaly/service/repository/rebase_in_progress.go +++ b/internal/gitaly/service/repository/rebase_in_progress.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "gitlab.com/gitlab-org/gitaly/internal/helper/housekeeping" + "gitlab.com/gitlab-org/gitaly/internal/git/housekeeping" "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/internal/tempdir/tempdir.go b/internal/tempdir/tempdir.go index 4878c6e1c..a94b88d44 100644 --- a/internal/tempdir/tempdir.go +++ b/internal/tempdir/tempdir.go @@ -11,8 +11,8 @@ import ( log "github.com/sirupsen/logrus" "gitlab.com/gitlab-org/gitaly/internal/dontpanic" + "gitlab.com/gitlab-org/gitaly/internal/git/housekeeping" "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/helper/housekeeping" "gitlab.com/gitlab-org/gitaly/internal/storage" "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" ) |