Mirrors/gitea
0
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-05-14 17:27:39 +02:00
Code Issues Activity

improve UpdateBranch

Browse Source
This commit is contained in:
Lunny Xiao 2025-12-01 20:19:55 -08:00
parent f424bab47a
commit f4ad96df2e
No known key found for this signature in database
GPG Key ID: C3B7C91B632F738A
2 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
routers/api/v1/repo/branch.go
View File

@ -439,12 +439,10 @@ func UpdateBranch(ctx *context.APIContext) {
// permission check has been done in api.go // permission check has been done in api.go
if err := repo_service.UpdateBranch(ctx, repo, ctx.Repo.GitRepo, ctx.Doer, branchName, opt.NewCommitID, opt.OldCommitID, opt.Force); err != nil { if err := repo_service.UpdateBranch(ctx, repo, ctx.Repo.GitRepo, ctx.Doer, branchName, opt.NewCommitID, opt.OldCommitID, opt.Force); err != nil {
switch { switch {
case git.IsErrNotExist(err): case git_model.IsErrBranchNotExist(err):
ctx.APIErrorNotFound(err)
case errors.Is(err, util.ErrInvalidArgument):
ctx.APIError(http.StatusUnprocessableEntity, err) ctx.APIError(http.StatusUnprocessableEntity, err)
case repo_service.IsErrBranchCommitDoesNotMatch(err):
ctx.APIError(http.StatusConflict, err)
case git.IsErrPushOutOfDate(err):
ctx.APIError(http.StatusConflict, "The update is not a fast-forward.")
case git.IsErrPushRejected(err): case git.IsErrPushRejected(err):
rej := err.(*git.ErrPushRejected) rej := err.(*git.ErrPushRejected)
ctx.APIError(http.StatusForbidden, rej.Message) ctx.APIError(http.StatusForbidden, rej.Message)

24
services/repository/branch.go
View File

@ -486,19 +486,23 @@ func RenameBranch(ctx context.Context, repo *repo_model.Repository, doer *user_m
// UpdateBranch moves a branch reference to the provided commit. permission check should be done before calling this function. // UpdateBranch moves a branch reference to the provided commit. permission check should be done before calling this function.
func UpdateBranch(ctx context.Context, repo *repo_model.Repository, gitRepo *git.Repository, doer *user_model.User, branchName, newCommitID, expectedOldCommitID string, force bool) error { func UpdateBranch(ctx context.Context, repo *repo_model.Repository, gitRepo *git.Repository, doer *user_model.User, branchName, newCommitID, expectedOldCommitID string, force bool) error {
branchCommit, err := gitRepo.GetBranchCommit(branchName) branch, err := git_model.GetBranch(ctx, repo.ID, branchName)
if err != nil { if err != nil {
return err return err
} }
currentCommitID := branchCommit.ID.String() if branch.IsDeleted {
return git_model.ErrBranchNotExist{
BranchName: branchName,
}
}
if expectedOldCommitID != "" { if expectedOldCommitID != "" {
expectedID, err := gitRepo.ConvertToGitID(expectedOldCommitID) expectedID, err := gitRepo.ConvertToGitID(expectedOldCommitID)
if err != nil { if err != nil {
return fmt.Errorf("ConvertToGitID(old): %w", err) return fmt.Errorf("ConvertToGitID(old): %w", err)
} }
if expectedID.String() != currentCommitID { if expectedID.String() != branch.CommitID {
return ErrBranchCommitDoesNotMatch{Expected: currentCommitID, Given: expectedID.String()} return util.NewInvalidArgumentErrorf("branch commit does not match [expected: %s, given: %s]", expectedID.String(), branch.CommitID)
} }
} }
@ -511,16 +515,16 @@ func UpdateBranch(ctx context.Context, repo *repo_model.Repository, gitRepo *git
return err return err
} }
if newCommit.ID.String() == currentCommitID { if newCommit.ID.String() == branch.CommitID {
return nil return nil
} }
isForcePush, err := newCommit.IsForcePush(currentCommitID) isForcePush, err := newCommit.IsForcePush(branch.CommitID)
if err != nil { if err != nil {
return err return err
} }
if isForcePush && !force { if isForcePush && !force {
return &git.ErrPushOutOfDate{Err: errors.New("non fast-forward update requires force"), StdErr: "non-fast-forward", StdOut: ""} return util.NewInvalidArgumentErrorf("Force push %s need a confirm force parameter", branchName)
} }
pushEnv := repo_module.PushingEnvironment(doer, repo) pushEnv := repo_module.PushingEnvironment(doer, repo)
@ -533,7 +537,7 @@ func UpdateBranch(ctx context.Context, repo *repo_model.Repository, gitRepo *git
protectedBranch.Repo = repo protectedBranch.Repo = repo
globsProtected := protectedBranch.GetProtectedFilePatterns() globsProtected := protectedBranch.GetProtectedFilePatterns()
if len(globsProtected) > 0 { if len(globsProtected) > 0 {
changedProtectedFiles, protectErr := pull_service.CheckFileProtection(gitRepo, branchName, currentCommitID, newCommit.ID.String(), globsProtected, 1, pushEnv) changedProtectedFiles, protectErr := pull_service.CheckFileProtection(gitRepo, branchName, branch.CommitID, newCommit.ID.String(), globsProtected, 1, pushEnv)
if protectErr != nil { if protectErr != nil {
if !pull_service.IsErrFilePathProtected(protectErr) { if !pull_service.IsErrFilePathProtected(protectErr) {
return fmt.Errorf("CheckFileProtection: %w", protectErr) return fmt.Errorf("CheckFileProtection: %w", protectErr)
@ -558,7 +562,7 @@ func UpdateBranch(ctx context.Context, repo *repo_model.Repository, gitRepo *git
} else if !protectedBranch.CanUserPush(ctx, doer) { } else if !protectedBranch.CanUserPush(ctx, doer) {
globsUnprotected := protectedBranch.GetUnprotectedFilePatterns() globsUnprotected := protectedBranch.GetUnprotectedFilePatterns()
if len(globsUnprotected) > 0 { if len(globsUnprotected) > 0 {
unprotectedOnly, unprotectedErr := pull_service.CheckUnprotectedFiles(gitRepo, branchName, currentCommitID, newCommit.ID.String(), globsUnprotected, pushEnv) unprotectedOnly, unprotectedErr := pull_service.CheckUnprotectedFiles(gitRepo, branchName, branch.CommitID, newCommit.ID.String(), globsUnprotected, pushEnv)
if unprotectedErr != nil { if unprotectedErr != nil {
return fmt.Errorf("CheckUnprotectedFiles: %w", unprotectedErr) return fmt.Errorf("CheckUnprotectedFiles: %w", unprotectedErr)
} }
@ -578,7 +582,7 @@ func UpdateBranch(ctx context.Context, repo *repo_model.Repository, gitRepo *git
} }
if expectedOldCommitID != "" { if expectedOldCommitID != "" {
pushOpts.ForceWithLease = fmt.Sprintf("%s:%s", git.BranchPrefix+branchName, currentCommitID) pushOpts.ForceWithLease = fmt.Sprintf("%s:%s", git.BranchPrefix+branchName, branch.CommitID)
} }
if isForcePush || force { if isForcePush || force {
pushOpts.Force = true pushOpts.Force = true