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.

Sign up for GitHub

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

Jump to bottom

Fix GetCommitBranchStart bug (#33298) #33421

Merged
merged 3 commits into from
Feb 1, 2025
Merged

Fix GetCommitBranchStart bug (#33298) #33421

merged 3 commits into from
Feb 1, 2025

Conversation

GiteaBot
Copy link
Collaborator

@GiteaBot GiteaBot commented Jan 28, 2025 •
edited by wxiaoguang
Loading

Backport #33298 by Zettat123

Fix #33265
Fix #33370

This PR also fixes some bugs in TestGitGeneral.

@Zettat123 @GiteaBot
Fix GetCommitBranchStart bug (go-gitea#33298)
107d891 
Fix go-gitea#33265
Fix go-gitea#33370

This PR also fixes some bugs in `TestGitGeneral`.
@GiteaBot GiteaBot added modifies/go Pull requests that update Go code type/bug labels Jan 28, 2025
@GiteaBot GiteaBot requested review from lunny and wxiaoguang January 28, 2025 02:59
@GiteaBot GiteaBot added this to the 1.23.2 milestone Jan 28, 2025
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jan 28, 2025
@pull-request-size pull-request-size bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jan 28, 2025
@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 Jan 28, 2025
@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 Jan 28, 2025
@silverwind
Copy link
Member

Test failure is related.

@wxiaoguang
Copy link
Contributor

@lunny @Zettat123

@lunny
Copy link
Member

lunny commented Feb 1, 2025

Maybe #33375 needs to backport to v1.23 to fix the failure test?

@wxiaoguang
Copy link
Contributor

Maybe #33375 needs to backport to v1.23 to fix the failure test?

It's too complex to backport. I will try to resolve the failures manually here.

@wxiaoguang
Copy link
Contributor

CI passes

@silverwind silverwind merged commit ebac324 into go-gitea:release/v1.23 Feb 1, 2025
26 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wxiaoguang wxiaoguang wxiaoguang approved these changes

@lunny lunny lunny approved these changes

Assignees

@Zettat123 Zettat123

Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/go Pull requests that update Go code size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/bug
Projects
None yet
Milestone
1.23.2
Development

Successfully merging this pull request may close these issues.
5 participants
@GiteaBot @silverwind @wxiaoguang @lunny @Zettat123