aboutsummaryrefslogtreecommitdiff
path: root/routers/repo/branch.go
diff options
context:
space:
mode:
authorUnknwon <u@gogs.io>2017-02-15 18:24:32 -0500
committerUnknwon <u@gogs.io>2017-02-15 18:24:32 -0500
commit189924cabf70a0a43b6c2d462d93b671aacdf2b8 (patch)
treeefe6f8f420b40e64b9fc713ac8c785ddce446d0a /routers/repo/branch.go
parentc2277796e4dc811db7f5c2555b2b5e1eb4a2c430 (diff)
repo/branch: force delete merged branch (#4128)
Diffstat (limited to 'routers/repo/branch.go')
-rw-r--r--routers/repo/branch.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/routers/repo/branch.go b/routers/repo/branch.go
index 4f32429f..d25898bb 100644
--- a/routers/repo/branch.go
+++ b/routers/repo/branch.go
@@ -52,7 +52,7 @@ func DeleteBranchPost(ctx *context.Context) {
if len(commitID) > 0 {
branchCommitID, err := ctx.Repo.GitRepo.GetBranchCommitID(branchName)
if err != nil {
- log.Error(4, "GetBranchCommitID: %v", err)
+ log.Error(2, "GetBranchCommitID: %v", err)
return
}
@@ -63,9 +63,9 @@ func DeleteBranchPost(ctx *context.Context) {
}
if err := ctx.Repo.GitRepo.DeleteBranch(branchName, git.DeleteBranchOptions{
- Force: false,
+ Force: true,
}); err != nil {
- log.Error(4, "DeleteBranch: %v", err)
+ log.Error(2, "DeleteBranch '%s': %v", branchName, err)
return
}
}