tdsds.com/gitea
1
1
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2025-07-24 11:18:36 +00:00
Code Releases 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:
TheFox0x7
2025-04-01 12:14:01 +02:00
committed by GitHub
parent 56e42be36d
commit ee3c82f874
294 changed files with 848 additions and 805 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/repository/files/cherry_pick.go
View File

@@ -5,6 +5,7 @@ package files
import (
"context"
"errors"
"fmt"
"strings"
@@ -100,7 +101,7 @@ func CherryPick(ctx context.Context, repo *repo_model.Repository, doer *user_mod
}
if conflict {
return nil, fmt.Errorf("failed to merge due to conflicts")
return nil, errors.New("failed to merge due to conflicts")
}
treeHash, err := t.WriteTree(ctx)