Skip to content

Commit

Permalink
Remove duplicated functions when deleting a branch (#25128)
Browse files Browse the repository at this point in the history
Extract from #22743

`DeleteBranch` will trigger a push update event, so that
`pull_service.CloseBranchPulls` has been invoked twice and
`AddDeletedBranch` is better to be moved to push update then even user
delete a branch via git command, it will also be triggered.

Co-authored-by: Giteabot <teabot@gitea.io>
  • Loading branch information
lunny and GiteaBot authored Jun 8, 2023
1 parent 3bdd480 commit 0d47b0a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 9 deletions.
9 changes: 0 additions & 9 deletions services/repository/branch.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import (
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/notification"
repo_module "code.gitea.io/gitea/modules/repository"
pull_service "code.gitea.io/gitea/services/pull"
)

// CreateNewBranch creates a new repository branch
Expand Down Expand Up @@ -181,10 +180,6 @@ func DeleteBranch(ctx context.Context, doer *user_model.User, repo *repo_model.R
return err
}

if err := pull_service.CloseBranchPulls(doer, repo.ID, branchName); err != nil {
return err
}

// Don't return error below this
if err := PushUpdate(
&repo_module.PushUpdateOptions{
Expand All @@ -199,9 +194,5 @@ func DeleteBranch(ctx context.Context, doer *user_model.User, repo *repo_model.R
log.Error("Update: %v", err)
}

if err := git_model.AddDeletedBranch(ctx, repo.ID, branchName, commit.ID.String(), doer.ID); err != nil {
log.Warn("AddDeletedBranch: %v", err)
}

return nil
}
3 changes: 3 additions & 0 deletions services/repository/push.go
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,9 @@ func pushUpdates(optsList []*repo_module.PushUpdateOptions) error {
// close all related pulls
log.Error("close related pull request failed: %v", err)
}
if err := git_model.AddDeletedBranch(db.DefaultContext, repo.ID, branch, opts.OldCommitID, pusher.ID); err != nil {
log.Warn("AddDeletedBranch: %v", err)
}
}

// Even if user delete a branch on a repository which he didn't watch, he will be watch that.
Expand Down

0 comments on commit 0d47b0a

Please sign in to comment.