domi/forgejo-domi
1
0
Fork 0
forked from forgejo/forgejo
Code Pull requests Activity

Removed unnecessary conversions (#7557)

Browse source 
No need to convert to the same type.
This commit is contained in:
Christian Muehlhaeuser 2019-07-23 20:50:39 +02:00 • committed by zeripath
parent 2f75766532
commit 54d96c79b5
24 changed files with 39 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/repofiles/update.go
View file

@ -317,7 +317,7 @@ func CreateOrUpdateRepoFile(repo *models.Repository, doer *models.User, opts *Up
if encoding != "UTF-8" {
charsetEncoding, _ := charset.Lookup(encoding)
if charsetEncoding != nil {
result, _, err := transform.String(charsetEncoding.NewEncoder(), string(content))
result, _, err := transform.String(charsetEncoding.NewEncoder(), content)
if err != nil {
// Look if we can't encode back in to the original we should just stick with utf-8
log.Error("Error re-encoding %s (%s) as %s - will stay as UTF-8: %v", opts.TreePath, opts.FromTreePath, encoding, err)