diff options
| author | wxiaoguang <wxiaoguang@gmail.com> | 2023-09-03 18:34:57 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-03 10:34:57 +0000 |
| commit | fc039167d200b423c95807758628e4899e3ca7df (patch) | |
| tree | ce59b8dbeb74d21b5f337b80160abe74c00a94a9 /services/gitdiff | |
| parent | 7477c93d621f4e7f1e09336e6c8bd741b3781f8c (diff) | |
| download | gitea-fc039167d200b423c95807758628e4899e3ca7df.tar.gz gitea-fc039167d200b423c95807758628e4899e3ca7df.zip | |
Use Go 1.21 and update dependencies (#26878)
To make sure Gitea's next release's lifecycle could have active Golang
support.
And min/max are builtin now.
Diffstat (limited to 'services/gitdiff')
| -rw-r--r-- | services/gitdiff/csv.go | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/services/gitdiff/csv.go b/services/gitdiff/csv.go index 5781d7e909..8db73c56a3 100644 --- a/services/gitdiff/csv.go +++ b/services/gitdiff/csv.go @@ -7,8 +7,6 @@ import ( "encoding/csv" "errors" "io" - - "code.gitea.io/gitea/modules/util" ) const ( @@ -396,7 +394,7 @@ func tryMapColumnsByContent(baseCSVReader *csvReader, base2HeadColMap []int, hea headStart := 0 for base2HeadColMap[i] == unmappedColumn && headStart < len(head2BaseColMap) { if head2BaseColMap[headStart] == unmappedColumn { - rows := util.Min(maxRowsToInspect, util.Max(0, util.Min(len(baseCSVReader.buffer), len(headCSVReader.buffer))-1)) + rows := min(maxRowsToInspect, max(0, min(len(baseCSVReader.buffer), len(headCSVReader.buffer))-1)) same := 0 for j := 1; j <= rows; j++ { baseCell, baseErr := getCell(baseCSVReader.buffer[j], i) |