From 7c802f6d83b50e5a647fbf667c25480d67f4791f Mon Sep 17 00:00:00 2001
From: Unknwon <u@gogs.io>
Date: Thu, 16 Mar 2017 20:09:27 -0400
Subject: repo/setting: filter out deleted branch in protect list (#4288)

---
 routers/repo/setting.go               | 10 +++++++++-
 templates/repo/settings/branches.tmpl |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/routers/repo/setting.go b/routers/repo/setting.go
index c52be187..eb139476 100644
--- a/routers/repo/setting.go
+++ b/routers/repo/setting.go
@@ -373,7 +373,15 @@ func SettingsBranches(ctx *context.Context) {
 		ctx.Handle(500, "GetProtectBranchesByRepoID", err)
 		return
 	}
-	ctx.Data["ProtectBranches"] = protectBranches
+
+	// Filter out deleted branches
+	branches := make([]string, 0, len(protectBranches))
+	for i := range protectBranches {
+		if ctx.Repo.GitRepo.IsBranchExist(protectBranches[i].Name) {
+			branches = append(branches, protectBranches[i].Name)
+		}
+	}
+	ctx.Data["ProtectBranches"] = branches
 
 	ctx.HTML(200, SETTINGS_BRANCHES)
 }
diff --git a/templates/repo/settings/branches.tmpl b/templates/repo/settings/branches.tmpl
index e5d6c1fb..92149b08 100644
--- a/templates/repo/settings/branches.tmpl
+++ b/templates/repo/settings/branches.tmpl
@@ -50,7 +50,7 @@
 					<div class="ui protected-branches list">
 						{{range .ProtectBranches}}
 							<div class="item">
-								<a href="{{$.Link}}/{{.Name}}"><code>{{.Name}}</code></a>
+								<a href="{{$.Link}}/{{.}}"><code>{{.}}</code></a>
 							</div>
 						{{end}}
 					</div>
-- 
cgit v1.2.3