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

Merged
merged 3 commits into from
Jan 28, 2025
Merged

Fix GetCommitBranchStart bug #33298

merged 3 commits into from
Jan 28, 2025

Conversation

Zettat123
Copy link
Contributor

@Zettat123 Zettat123 commented Jan 16, 2025 •
edited
Loading

Fix #33265
Fix #33370

This PR also fixes some bugs in TestGitGeneral.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jan 16, 2025
@pull-request-size pull-request-size bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Jan 16, 2025
@github-actions github-actions bot added the modifies/go Pull requests that update Go code label Jan 16, 2025
@pull-request-size pull-request-size bot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jan 16, 2025
@pull-request-size pull-request-size bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jan 17, 2025
@lunny lunny added the type/bug label Jan 18, 2025
@Zettat123 Zettat123 requested a review from lunny January 24, 2025 02:44
@Zettat123 Zettat123 mentioned this pull request Jan 24, 2025
Closed
@Zettat123 Zettat123 mentioned this pull request Jan 26, 2025
Closed
lunny
lunny approved these changes Jan 26, 2025
View reviewed changes
modules/git/repo_commit.go
@@ -533,19 +534,18 @@ func (repo *Repository) GetCommitBranchStart(env []string, branch, endCommitID s

parts := bytes.Split(bytes.TrimSpace(stdout), []byte{'\n'})

var startCommitID string
// check the commits one by one until we find a commit contained by another branch
// and we think this commit is the divergence point
for _, commitID := range parts {
branches, err := repo.getBranches(env, string(commitID), 2)
if err != nil {
return "", err
}
for _, b := range branches {
Copy link
Member

Choose a reason for hiding this comment

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

Maybe we can use len(branches) >1 here

@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 26, 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 27, 2025
@lunny lunny added backport/v1.23 This PR should be backported to Gitea 1.23 reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. labels Jan 27, 2025
@lunny lunny enabled auto-merge (squash) January 28, 2025 02:27
@lunny lunny merged commit a9577e0 into go-gitea:main Jan 28, 2025
26 checks passed
@GiteaBot GiteaBot added this to the 1.24.0 milestone Jan 28, 2025
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Jan 28, 2025
@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 mentioned this pull request Jan 28, 2025
Merged
@GiteaBot GiteaBot added backport/done All backports for this PR have been created and removed reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. labels Jan 28, 2025
@wxiaoguang wxiaoguang deleted the bugfix/issue-33265 branch January 28, 2025 03:10
silverwind pushed a commit that referenced this pull request Feb 1, 2025
@GiteaBot @Zettat123
@lunny @wxiaoguang
Fix GetCommitBranchStart bug (#33298) (#33421)
ebac324 
Backport #33298 by Zettat123

Fix #33265
Fix #33370

This PR also fixes some bugs in `TestGitGeneral`.

---------

Co-authored-by: Zettat123 <[email protected]>
Co-authored-by: Lunny Xiao <[email protected]>
Co-authored-by: wxiaoguang <[email protected]>
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
No one assigned
Labels
backport/done All backports for this PR have been created backport/v1.23 This PR should be backported to Gitea 1.23 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.24.0
4 participants
@Zettat123 @lunny @wxiaoguang @GiteaBot