From aa02463ded9e8618375db4a3cb3c1b2593e96a8e Mon Sep 17 00:00:00 2001 From: John Olheiser <42128690+jolheiser@users.noreply.github.com> Date: Mon, 8 Apr 2019 00:08:02 -0500 Subject: Delete local branch if it exists (#6497) Signed-off-by: jolheiser --- routers/repo/branch.go | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'routers/repo') diff --git a/routers/repo/branch.go b/routers/repo/branch.go index a29519a43f..4d5b3996c9 100644 --- a/routers/repo/branch.go +++ b/routers/repo/branch.go @@ -71,6 +71,12 @@ func DeleteBranchPost(ctx *context.Context) { return } + // Delete branch in local copy if it exists + if err := ctx.Repo.Repository.DeleteLocalBranch(branchName); err != nil { + ctx.Flash.Error(ctx.Tr("repo.branch.deletion_failed", branchName)) + return + } + ctx.Flash.Success(ctx.Tr("repo.branch.deletion_success", branchName)) } -- cgit v1.2.3