From 928417ae39c835edc955c8bb9a02eab2733294c3 Mon Sep 17 00:00:00 2001
From: Lunny Xiao <xiaolunwen@gmail.com>
Date: Mon, 10 Dec 2018 06:45:44 +0800
Subject: [PATCH] Fix empty wiki (#5504)
* fix wiki page when wiki path is exist but empty
* improve the error check
---
routers/repo/wiki.go | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/routers/repo/wiki.go b/routers/repo/wiki.go
index 234923635..7e5212977 100644
--- a/routers/repo/wiki.go
+++ b/routers/repo/wiki.go
@@ -74,7 +74,6 @@ func findWikiRepoCommit(ctx *context.Context) (*git.Repository, *git.Commit, err
commit, err := wikiRepo.GetBranchCommit("master")
if err != nil {
- ctx.ServerError("GetBranchCommit", err)
return wikiRepo, nil, err
}
return wikiRepo, commit, nil
@@ -112,6 +111,9 @@ func wikiContentsByName(ctx *context.Context, commit *git.Commit, wikiName strin
func renderWikiPage(ctx *context.Context, isViewPage bool) (*git.Repository, *git.TreeEntry) {
wikiRepo, commit, err := findWikiRepoCommit(ctx)
if err != nil {
+ if !git.IsErrNotExist(err) {
+ ctx.ServerError("GetBranchCommit", err)
+ }
return nil, nil
}