Fix #8582 by handling empty repos (#8587) (#8594)

* Fix #8582 by handling empty repos Signed-off-by: Jonas Franz <info@jonasfranz.software> * Fix tests Signed-off-by: Jonas Franz <info@jonasfranz.software>
go-gitea · Oct 19, 2019 · 435ce92 · 435ce92
1 parent 22cea96
commit 435ce92
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/modules/repofiles/content.go b/modules/repofiles/content.go
@@ -38,6 +38,9 @@ func (ct *ContentType) String() string {
 // GetContentsOrList gets the meta data of a file's contents (*ContentsResponse) if treePath not a tree
 // directory, otherwise a listing of file contents ([]*ContentsResponse). Ref can be a branch, commit or tag
 func GetContentsOrList(repo *models.Repository, treePath, ref string) (interface{}, error) {
+ if repo.IsEmpty {
+ return make([]interface{}, 0), nil
+ }
  if ref == "" {
  ref = repo.DefaultBranch
  }

diff --git a/modules/repofiles/content_test.go b/modules/repofiles/content_test.go
@@ -190,3 +190,19 @@ func TestGetContentsOrListErrors(t *testing.T) {
  assert.Nil(t, fileContentResponse)
  })
 }
+
+func TestGetContentsOrListOfEmptyRepos(t *testing.T) {
+ models.PrepareTestEnv(t)
+ ctx := test.MockContext(t, "user2/repo15")
+ ctx.SetParams(":id", "15")
+ test.LoadRepo(t, ctx, 15)
+ test.LoadUser(t, ctx, 2)
+ test.LoadGitRepo(t, ctx)
+ repo := ctx.Repo.Repository
+
+ t.Run("empty repo", func(t *testing.T) {
+ contents, err := GetContentsOrList(repo, "", "")
+ assert.NoError(t, err)
+ assert.Empty(t, contents)
+ })
+}