Skip to content

Commit

Permalink
Fix empty wiki (#5504)
Browse files Browse the repository at this point in the history
* fix wiki page when wiki path is exist but empty

* improve the error check
  • Loading branch information
lunny authored and techknowlogick committed Dec 9, 2018
1 parent 7e5abe2 commit 928417a
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion routers/repo/wiki.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
}

Expand Down

0 comments on commit 928417a

Please sign in to comment.