From 5f4522cd1fc4207138c54c706b65f62083fb4299 Mon Sep 17 00:00:00 2001
From: zeripath <art27@cantab.net>
Date: Wed, 16 Jun 2021 23:16:47 +0100
Subject: [PATCH] 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>
---
modules/git/repo_language_stats_nogogit.go | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/modules/git/repo_language_stats_nogogit.go b/modules/git/repo_language_stats_nogogit.go
index 0130d0a300..abbf5e943b 100644
--- a/modules/git/repo_language_stats_nogogit.go
+++ b/modules/git/repo_language_stats_nogogit.go
@@ -25,11 +25,7 @@ func (repo *Repository) GetLanguageStats(commitID string) (map[string]int64, err
defer cancel()
writeID := func(id string) error {
- _, err := batchStdinWriter.Write([]byte(id))
- if err != nil {
- return err
- }
- _, err = batchStdinWriter.Write([]byte{'\n'})
+ _, err := batchStdinWriter.Write([]byte(id + "\n"))
return err
}
@@ -85,10 +81,10 @@ func (repo *Repository) GetLanguageStats(commitID string) (map[string]int64, err
}
sizeToRead := size
- discard := int64(0)
+ discard := int64(1)
if size > fileSizeLimit {
sizeToRead = fileSizeLimit
- discard = size - fileSizeLimit
+ discard = size - fileSizeLimit + 1
}
_, err = contentBuf.ReadFrom(io.LimitReader(batchReader, sizeToRead))