]> source.dussan.org Git - gitea.git/commitdiff
Trigger webhook when deleting a branch after merging a PR (#9424)
authorBrad Albright <32200834+bhalbright@users.noreply.github.com>
Wed, 25 Dec 2019 05:59:41 +0000 (23:59 -0600)
committerzeripath <art27@cantab.net>
Wed, 25 Dec 2019 05:59:41 +0000 (05:59 +0000)
* fixed so when deleting a branch after merging a PR, a webhook is triggered

* changed to use pr.HeadRepo instead of ctx.Repo when sending webhook for a deletion of branch after merging pr

Co-authored-by: Lauris BH <lauris@nix.lv>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
routers/repo/pull.go

index e4b4a5ac4987ee20eebe318ed4e1d7fac3b18265..932e99290b4411de7776658ceb60516731a4630f 100644 (file)
@@ -22,6 +22,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,
+               repofiles.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)