lavender-legacy
/
gitea
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix missing discard in repo_language_stats (#16030) 

Set the missing discard(1) in repo_language_stats.

Signed-off-by: Andrew Thornton <art27@cantab.net>

Co-authored-by: 6543 <6543@obermui.de>
release/v1.15
zeripath 2021-06-16 23:16:47 +01:00 committed by GitHub
parent 6d69df2804
commit 5f4522cd1f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/git/repo_language_stats_nogogit.go
View File

@ -25,11 +25,7 @@ func (repo *Repository) GetLanguageStats(commitID string) (map[string]int64, err
defer cancel() defer cancel()
writeID := func(id string) error { writeID := func(id string) error {
_, err := batchStdinWriter.Write([]byte(id)) _, err := batchStdinWriter.Write([]byte(id + "\n"))
if err != nil {
return err
}
_, err = batchStdinWriter.Write([]byte{'\n'})
return err return err
} }
@ -85,10 +81,10 @@ func (repo *Repository) GetLanguageStats(commitID string) (map[string]int64, err
} }
sizeToRead := size sizeToRead := size
discard := int64(0) discard := int64(1)
if size > fileSizeLimit { if size > fileSizeLimit {
sizeToRead = fileSizeLimit sizeToRead = fileSizeLimit
discard = size - fileSizeLimit discard = size - fileSizeLimit + 1
} }
_, err = contentBuf.ReadFrom(io.LimitReader(batchReader, sizeToRead)) _, err = contentBuf.ReadFrom(io.LimitReader(batchReader, sizeToRead))