aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad Albright <32200834+bhalbright@users.noreply.github.com>2019-12-24 01:01:02 -0600
committerzeripath <art27@cantab.net>2019-12-24 07:01:02 +0000
commit58c38ab4b6a7031ad8261dfd8af67d2bbab9b41b (patch)
treecc745fb724bf87153ebf59131a97166fc2eeba94
parenta276aaf61e134a3f4d44b7dc53a2366af9de0483 (diff)
downloadgitea-58c38ab4b6a7031ad8261dfd8af67d2bbab9b41b.tar.gz
gitea-58c38ab4b6a7031ad8261dfd8af67d2bbab9b41b.zip
backport fix: fixed bug in GitTreeBySHA where pulling items from a page other than page 1 would fail because the wrong var was used to set the entries to return (#9482)
-rw-r--r--modules/repofiles/tree.go10
1 files changed, 5 insertions, 5 deletions
diff --git a/modules/repofiles/tree.go b/modules/repofiles/tree.go
index cf0534563f..b3edea341f 100644
--- a/modules/repofiles/tree.go
+++ b/modules/repofiles/tree.go
@@ -79,11 +79,11 @@ func GetTreeBySHA(repo *models.Repository, sha string, page, perPage int, recurs
for e := rangeStart; e < rangeEnd; e++ {
i := e - rangeStart
- tree.Entries[e].Path = entries[e].Name()
- tree.Entries[e].Mode = fmt.Sprintf("%06o", entries[e].Mode())
- tree.Entries[e].Type = entries[e].Type()
- tree.Entries[e].Size = entries[e].Size()
- tree.Entries[e].SHA = entries[e].ID.String()
+ tree.Entries[i].Path = entries[e].Name()
+ tree.Entries[i].Mode = fmt.Sprintf("%06o", entries[e].Mode())
+ tree.Entries[i].Type = entries[e].Type()
+ tree.Entries[i].Size = entries[e].Size()
+ tree.Entries[i].SHA = entries[e].ID.String()
if entries[e].IsDir() {
copy(treeURL[copyPos:], entries[e].ID.String())