From 189924cabf70a0a43b6c2d462d93b671aacdf2b8 Mon Sep 17 00:00:00 2001 From: Unknwon Date: Wed, 15 Feb 2017 18:24:32 -0500 Subject: [PATCH] repo/branch: force delete merged branch (#4128) --- routers/repo/branch.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/routers/repo/branch.go b/routers/repo/branch.go index 4f32429ff..d25898bb8 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 } }