From f0bda12c49ead1f9ee8ee6f40c90f68427cf538a Mon Sep 17 00:00:00 2001 From: Brad Albright <32200834+bhalbright@users.noreply.github.com> Date: Fri, 27 Dec 2019 00:36:52 -0600 Subject: [PATCH] when branch is deleted after a pull request is merged, trigger webhook (#9510) --- routers/repo/pull.go | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/routers/repo/pull.go b/routers/repo/pull.go index 33bf1b2ed97..f46d093793c 100644 --- a/routers/repo/pull.go +++ b/routers/repo/pull.go @@ -21,6 +21,7 @@ import ( "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/notification" + "code.gitea.io/gitea/modules/repofiles" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/util" "code.gitea.io/gitea/services/gitdiff" @@ -928,6 +929,21 @@ func CleanUpPullRequest(ctx *context.Context) { return } + if err := repofiles.PushUpdate( + pr.HeadRepo, + pr.HeadBranch, + models.PushUpdateOptions{ + RefFullName: git.BranchPrefix + pr.HeadBranch, + OldCommitID: branchCommitID, + NewCommitID: git.EmptySHA, + PusherID: ctx.User.ID, + PusherName: ctx.User.Name, + RepoUserName: pr.HeadRepo.Owner.Name, + RepoName: pr.HeadRepo.Name, + }); err != nil { + log.Error("Update: %v", err) + } + if err := models.AddDeletePRBranchComment(ctx.User, pr.BaseRepo, issue.ID, pr.HeadBranch); err != nil { // Do not fail here as branch has already been deleted log.Error("DeleteBranch: %v", err)