test1234
/
gitea
forked from gitea/gitea
1
0
Fork 0
Code Pull Requests Activity

branch: Trigger update when deleting branch via UI. (#5617) 

Fixes: #5309.
This commit is contained in:
Harshit Bansal 2019-01-02 18:26:58 +05:30 committed by Lunny Xiao
parent 4c52858c39
commit 8764f1512d
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
routers/repo/branch.go
View File

@ -126,7 +126,19 @@ func deleteBranch(ctx *context.Context, branchName string) error {
return err return err
} }
// Don't return error here // Don't return error below this
if err := models.PushUpdate(branchName, models.PushUpdateOptions{
RefFullName: git.BranchPrefix + branchName,
OldCommitID: commit.ID.String(),
NewCommitID: git.EmptySHA,
PusherID: ctx.User.ID,
PusherName: ctx.User.Name,
RepoUserName: ctx.Repo.Owner.Name,
RepoName: ctx.Repo.Repository.Name,
}); err != nil {
log.Error(4, "Update: %v", err)
}
if err := ctx.Repo.Repository.AddDeletedBranch(branchName, commit.ID.String(), ctx.User.ID); err != nil { if err := ctx.Repo.Repository.AddDeletedBranch(branchName, commit.ID.String(), ctx.User.ID); err != nil {
log.Warn("AddDeletedBranch: %v", err) log.Warn("AddDeletedBranch: %v", err)
} }