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

Ensure that git commit tree continues properly over the page #12142

Merged
merged 6 commits into from
Jul 16, 2020

Conversation

zeripath
Copy link
Contributor

@zeripath zeripath commented Jul 4, 2020

One of the problems with using git log --graph --skip=$n -n $n is that branches that continue across pages disappear. This PR does a slightly different solution - the whole graph is generated but only the last $n commits are collected - (including any intervening relations)

Fix #12133
Fix #10217

Signed-off-by: Andrew Thornton art27@cantab.net

Signed-off-by: Andrew Thornton <art27@cantab.net>
@zeripath zeripath added this to the 1.13.0 milestone Jul 4, 2020
Signed-off-by: Andrew Thornton <art27@cantab.net>
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Jul 4, 2020
Signed-off-by: Andrew Thornton <art27@cantab.net>
@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 Jul 16, 2020
@lafriks
Copy link
Member

lafriks commented Jul 16, 2020

🚀

@techknowlogick
Copy link
Member

🚀

@techknowlogick techknowlogick merged commit 3bcc6e7 into go-gitea:master Jul 16, 2020
@zeripath zeripath deleted the git-graph-continue branch July 16, 2020 20:15
@Spongman
Copy link

the whole graph is generated

i haven't tried this, but i have a repo with over 80,000 commits. does this scale?

@go-gitea go-gitea locked and limited conversation to collaborators Nov 24, 2020
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. type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

commit graph erroneously shows branches as ending Allow to pin commit graph branch order
6 participants