Skip to content

Fix #19346 - Avoid MoreThanOne error when creating a branch whose name conflicts with other ref names #19557

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

Merged
merged 4 commits into from
May 1, 2022
Merged

Fix #19346 - Avoid MoreThanOne error when creating a branch whose name conflicts with other ref names #19557

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0d2afca
Avoid MoreThanOne Error
99rgosse Apr 29, 2022
37abfaf
Merge branch 'main' into Branch_Error_#19346
zeripath Apr 29, 2022
f64e44e
Merge branch 'main' into Branch_Error_#19346
6543 Apr 30, 2022
31484c9
Merge branch 'main' into Branch_Error_#19346
6543 May 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion services/repository/branch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ func CreateNewBranch(ctx context.Context, doer *user_model.User, repo *repo_mode

if err := git.Push(ctx, repo.RepoPath(), git.PushOptions{
Remote: repo.RepoPath(),
Branch: fmt.Sprintf("%s:%s%s", oldBranchName, git.BranchPrefix, branchName),
Branch: fmt.Sprintf("%s%s:%s%s", git.BranchPrefix, oldBranchName, git.BranchPrefix, branchName),
Copy link
Contributor

@wxiaoguang wxiaoguang Apr 29, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

The oldBranchName might be checked whether is has the BranchPrefix already (and handle the existing prefix gracefully). Otherwise there will be another error.

Hmm, not a must since the old code already works. It seems that this function requires that oldBranchName and branchName shouldn't not have the prefix.

Env: models.PushingEnvironment(doer, repo),
}); err != nil {
if git.IsErrPushOutOfDate(err) || git.IsErrPushRejected(err) {
Expand Down