USEFULL
/
gogs
mirror of https://github.com/gogs/gogs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

repo/branch: force delete merged branch (#4128)

pull/3785/merge
Unknwon 2017-02-15 18:24:32 -05:00
parent c2277796e4
commit 189924cabf
No known key found for this signature in database
GPG Key ID: 7A02C406FAC875A2
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
routers/repo/branch.go
View File

@ -52,7 +52,7 @@ func DeleteBranchPost(ctx *context.Context) {
if len(commitID) > 0 { if len(commitID) > 0 {
branchCommitID, err := ctx.Repo.GitRepo.GetBranchCommitID(branchName) branchCommitID, err := ctx.Repo.GitRepo.GetBranchCommitID(branchName)
if err != nil { if err != nil {
log.Error(4, "GetBranchCommitID: %v", err) log.Error(2, "GetBranchCommitID: %v", err)
return return
} }
@ -63,9 +63,9 @@ func DeleteBranchPost(ctx *context.Context) {
} }
if err := ctx.Repo.GitRepo.DeleteBranch(branchName, git.DeleteBranchOptions{ if err := ctx.Repo.GitRepo.DeleteBranch(branchName, git.DeleteBranchOptions{
Force: false, Force: true,
}); err != nil { }); err != nil {
log.Error(4, "DeleteBranch: %v", err) log.Error(2, "DeleteBranch '%s': %v", branchName, err)
return return
} }
} }