Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Faster git.GetDivergingCommits #24482

Merged

Conversation

oliverpool
Copy link
Contributor

@oliverpool oliverpool commented May 2, 2023

Using git rev-list --left-right is almost 2x faster than calling git rev-list twice.


On my machine:

At 086b226 (current state):

> go test -run ^TestRepoGetDivergingCommits$ code.gitea.io/gitea/modules/git -count=100
ok  	code.gitea.io/gitea/modules/git	1.394s

At 845fd83 (tip of this PR):

> go test -run ^TestRepoGetDivergingCommits$ code.gitea.io/gitea/modules/git -count=100
ok  	code.gitea.io/gitea/modules/git	0.739s

contributed in the context of @forgejo

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label May 2, 2023
@pull-request-size pull-request-size bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label May 2, 2023
@delvh delvh added the performance/speed performance issues with slow downs label May 2, 2023
@lunny lunny added this to the 1.20.0 milestone May 2, 2023
modules/git/repo.go Outdated Show resolved Hide resolved
Copy link
Member

@6543 6543 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice catch!

@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels May 3, 2023
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels May 4, 2023
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label May 4, 2023
@techknowlogick techknowlogick enabled auto-merge (squash) May 4, 2023 04:15
@techknowlogick techknowlogick merged commit 75ea0d5 into go-gitea:main May 4, 2023
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label May 4, 2023
@oliverpool oliverpool deleted the faster_git_diverging_commits branch May 4, 2023 09:03
zjjhot added a commit to zjjhot/gitea that referenced this pull request May 5, 2023
* upstream/main:
  Harmonize title formatting in `docs/content/doc/development/api-usage.en-us.md` (go-gitea#24529)
  automate locking closed threads (go-gitea#24525)
  [skip ci] Updated translations via Crowdin
  Display warning when user try to rename default branch (go-gitea#24512)
  Upgrade to Node 20 on CI, enable actions cancellation (go-gitea#24524)
  Fix incorrectly quoted translation (go-gitea#24514)
  Fix color for transfer related buttons when having no permission to act (go-gitea#24510)
  Fix some mistakes when using `ignSignIn` (go-gitea#24415)
  Remove unused zapx replace statement on go.mod (go-gitea#24515)
  Don't display creating page button in a mirror wiki repository (go-gitea#24395)
  Improve template system and panic recovery (go-gitea#24461)
  Faster git.GetDivergingCommits (go-gitea#24482)
  Merge setting.InitXXX into one function with options (go-gitea#24389)
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Aug 3, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. performance/speed performance issues with slow downs size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants