Skip to content

Commit 75950d0

Browse files
committed
feat: add deleted branches
1 parent a844be5 commit 75950d0

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

routers/private/hook_post_receive.go

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"net/http"
99
"strconv"
1010

11+
git_model "code.gitea.io/gitea/models/git"
1112
issues_model "code.gitea.io/gitea/models/issues"
1213
repo_model "code.gitea.io/gitea/models/repo"
1314
"code.gitea.io/gitea/modules/git"
@@ -106,7 +107,15 @@ func HookPostReceive(ctx *gitea_context.PrivateContext) {
106107
wasEmpty = repo.IsEmpty
107108
}
108109

109-
if !update.IsDelRef() {
110+
if update.IsDelRef() {
111+
if err := git_model.AddDeletedBranch(ctx, repo.ID, update.RefFullName.BranchName(), update.PusherID); err != nil {
112+
log.Error("Failed to add deleted branch: %s/%s Error: %v", ownerName, repoName, err)
113+
ctx.JSON(http.StatusInternalServerError, private.HookPostReceiveResult{
114+
Err: fmt.Sprintf("Failed to add deleted branch: %s/%s Error: %v", ownerName, repoName, err),
115+
})
116+
return
117+
}
118+
} else {
110119
if gitRepo == nil {
111120
var err error
112121
gitRepo, err = gitrepo.OpenRepository(ctx, repo)

services/repository/push.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import (
1111
"time"
1212

1313
"code.gitea.io/gitea/models/db"
14-
git_model "code.gitea.io/gitea/models/git"
1514
repo_model "code.gitea.io/gitea/models/repo"
1615
user_model "code.gitea.io/gitea/models/user"
1716
"code.gitea.io/gitea/modules/cache"
@@ -271,10 +270,6 @@ func pushUpdates(optsList []*repo_module.PushUpdateOptions) error {
271270
// close all related pulls
272271
log.Error("close related pull request failed: %v", err)
273272
}
274-
275-
if err := git_model.AddDeletedBranch(ctx, repo.ID, branch, pusher.ID); err != nil {
276-
return fmt.Errorf("AddDeletedBranch %s:%s failed: %v", repo.FullName(), branch, err)
277-
}
278273
}
279274

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

0 commit comments

Comments
 (0)