public/gitea
1
0 Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-10-26 06:16:56 +09:00
Code Issues Packages Projects Releases Wiki Activity

Enable addtional linters (#34085)

Browse Source 
enable mirror, usestdlibbars and perfsprint 
part of: https://github.com/go-gitea/gitea/issues/34083

---------

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
This commit is contained in:
TheFox0x7andwxiaoguang authored and GitHub committed 2025-04-01 10:14:01 +00:00
1 parent 56e42be36d
commit ee3c82f874
294 files changed
+848 -805
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

services/pull/patch.go
+1 -1
View File
@@ -134,7 +134,7 @@ type errMergeConflict struct {
}
func (e *errMergeConflict) Error() string {
return fmt.Sprintf("conflict detected at: %s", e.filename)
return "conflict detected at: " + e.filename
}
func attemptMerge(ctx context.Context, file *unmergedFile, tmpBasePath string, filesToRemove *[]string, filesToAdd *[]git.IndexObjectInfo) error {