diff options
| author | Paul Okstad <pokstad@gitlab.com> | 2020-07-02 06:00:26 +0300 |
|---|---|---|
| committer | Paul Okstad <pokstad@gitlab.com> | 2020-07-02 06:00:26 +0300 |
| commit | 60e46e79f68b7e184551874d58ca714bcfc0cde0 (patch) | |
| tree | 72dab7a085ea1786048fef6dd320c04da1d32698 | |
| parent | 9dcad7075465ebfa6d9891a693e9292541f78c5f (diff) | |
| parent | f68cebcfd5f888de5278509f05a1324db8f5fcbd (diff) | |
Merge branch 'sluongngoc/gc-commit-graph' into 'master'
gc: Use dedicated commit-graph write func
See merge request gitlab-org/gitaly!2305
| -rw-r--r-- | internal/service/repository/gc.go | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/internal/service/repository/gc.go b/internal/service/repository/gc.go index 957a33f66..8dfa3890f 100644 --- a/internal/service/repository/gc.go +++ b/internal/service/repository/gc.go @@ -47,6 +47,10 @@ func (s *server) GarbageCollect(ctx context.Context, in *gitalypb.GarbageCollect return nil, err } + if err := writeCommitGraph(ctx, &gitalypb.WriteCommitGraphRequest{Repository: repo}); err != nil { + return nil, err + } + // Perform housekeeping post GC err = housekeeping.Perform(ctx, repoPath) if err != nil { @@ -61,11 +65,6 @@ func (s *server) GarbageCollect(ctx context.Context, in *gitalypb.GarbageCollect func gc(ctx context.Context, in *gitalypb.GarbageCollectRequest) error { args := repackConfig(ctx, in.CreateBitmap) - // run garbage collect and also write the commit graph - args = append(args, - git.ValueFlag{"-c", "gc.writeCommitGraph=true"}, - ) - cmd, err := git.SafeCmd(ctx, in.GetRepository(), args, git.SubCmd{Name: "gc"}, ) |