From a0a35cacee8f83d6522ea0392bf80e367315fde5 Mon Sep 17 00:00:00 2001 From: Andrew Thornton Date: Fri, 17 Jun 2022 19:28:50 +0100 Subject: [PATCH 1/2] Write Commit-Graphs in RepositoryDumper When migrating git repositories we should ensure that the commit-graph is written. Signed-off-by: Andrew Thornton --- services/migrations/dump.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/services/migrations/dump.go b/services/migrations/dump.go index ad04756d4bc89..1141f780dcc18 100644 --- a/services/migrations/dump.go +++ b/services/migrations/dump.go @@ -159,6 +159,9 @@ func (g *RepositoryDumper) CreateRepo(repo *base.Repository, opts base.MigrateOp if err != nil { return fmt.Errorf("Clone: %v", err) } + if err := git.WriteCommitGraph(g.ctx, repoPath); err != nil { + return err + } if opts.Wiki { wikiPath := g.wikiPath() @@ -179,6 +182,10 @@ func (g *RepositoryDumper) CreateRepo(repo *base.Repository, opts base.MigrateOp if err := os.RemoveAll(wikiPath); err != nil { return fmt.Errorf("Failed to remove %s: %v", wikiPath, err) } + } else { + if err := git.WriteCommitGraph(g.ctx, wikiPath); err != nil { + return err + } } } } From 3cdd21df17d3887c62ba45a01a4f49ad6fbd2fe1 Mon Sep 17 00:00:00 2001 From: zeripath Date: Fri, 17 Jun 2022 19:58:19 +0100 Subject: [PATCH 2/2] Update services/migrations/dump.go Co-authored-by: delvh --- services/migrations/dump.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/services/migrations/dump.go b/services/migrations/dump.go index 1141f780dcc18..21d03b333f8cb 100644 --- a/services/migrations/dump.go +++ b/services/migrations/dump.go @@ -182,10 +182,8 @@ func (g *RepositoryDumper) CreateRepo(repo *base.Repository, opts base.MigrateOp if err := os.RemoveAll(wikiPath); err != nil { return fmt.Errorf("Failed to remove %s: %v", wikiPath, err) } - } else { - if err := git.WriteCommitGraph(g.ctx, wikiPath); err != nil { - return err - } + } else if err := git.WriteCommitGraph(g.ctx, wikiPath); err != nil { + return err } } }