diff options
| author | Brecht Van Lommel | 2023-03-01 20:19:04 +0100 |
|---|---|---|
| committer | GitHub | 2023-03-01 14:19:04 -0500 |
| commit | 0268ee5c37b8ad733678f02bc15ec8642da62c10 (patch) | |
| tree | a162b168d4c47411a0d55bb244316b67577c33dc /services | |
| parent | 403f3e9208b2d2564d67bdf87be758c487083e28 (diff) | |
Do not create commit graph for temporary repos (#23219)
When fetching remotes for conflict checking, skip unnecessary and
potentially slow writing of commit graphs.
In a test with the Blender repository, this reduces conflict checking
time for one pull request from about 2s to 0.1s.
Diffstat (limited to 'services')
| -rw-r--r-- | services/pull/temp_repo.go | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/services/pull/temp_repo.go b/services/pull/temp_repo.go index e0d6b4a15..2bef67155 100644 --- a/services/pull/temp_repo.go +++ b/services/pull/temp_repo.go @@ -67,6 +67,12 @@ func createTemporaryRepo(ctx context.Context, pr *issues_model.PullRequest) (str remoteRepoName := "head_repo" baseBranch := "base" + fetchArgs := git.TrustedCmdArgs{"--no-tags"} + if git.CheckGitVersionAtLeast("2.25.0") == nil { + // Writing the commit graph can be slow and is not needed here + fetchArgs = append(fetchArgs, "--no-write-commit-graph") + } + // Add head repo remote. addCacheRepo := func(staging, cache string) error { p := filepath.Join(staging, ".git", "objects", "info", "alternates") @@ -108,7 +114,7 @@ func createTemporaryRepo(ctx context.Context, pr *issues_model.PullRequest) (str outbuf.Reset() errbuf.Reset() - if err := git.NewCommand(ctx, "fetch", "origin", "--no-tags").AddDashesAndList(pr.BaseBranch+":"+baseBranch, pr.BaseBranch+":original_"+baseBranch). + if err := git.NewCommand(ctx, "fetch", "origin").AddArguments(fetchArgs...).AddDashesAndList(pr.BaseBranch+":"+baseBranch, pr.BaseBranch+":original_"+baseBranch). Run(&git.RunOpts{ Dir: tmpBasePath, Stdout: &outbuf, @@ -171,7 +177,7 @@ func createTemporaryRepo(ctx context.Context, pr *issues_model.PullRequest) (str } else { headBranch = pr.GetGitRefName() } - if err := git.NewCommand(ctx, "fetch", "--no-tags").AddDynamicArguments(remoteRepoName, headBranch+":"+trackingBranch). + if err := git.NewCommand(ctx, "fetch").AddArguments(fetchArgs...).AddDynamicArguments(remoteRepoName, headBranch+":"+trackingBranch). Run(&git.RunOpts{ Dir: tmpBasePath, Stdout: &outbuf, |