diff options
| author | Gusted <williamzijl7@hotmail.com> | 2021-11-15 06:02:53 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-15 14:02:53 +0800 |
| commit | 253d9e415813e90543cca8d94112c9e4238d39a4 (patch) | |
| tree | c60e0dc33e437dfbd4855b9c0b5939351451720f | |
| parent | 562785ef4ea8ea4b24da726a4fbf515358ee7084 (diff) | |
| download | gitea-253d9e415813e90543cca8d94112c9e4238d39a4.tar.gz gitea-253d9e415813e90543cca8d94112c9e4238d39a4.zip | |
Remove unnecassary calls to `filepath.Join` (#17608)
- Partialy resolvess #17596
- Resolves `badCall` errors from go-critic `badCall: suspicious Join on
1 argument`
- When only 1 argument is passed into `filepath.Join`, it won't do
anything special other than `filepath.Clean(...)` will be applied over
it.
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: 6543 <6543@obermui.de>
| -rw-r--r-- | modules/repository/adopt.go | 2 | ||||
| -rw-r--r-- | routers/web/user/setting/adopt.go | 2 | ||||
| -rw-r--r-- | routers/web/user/setting/profile.go | 2 | ||||
| -rw-r--r-- | services/pull/merge.go | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/modules/repository/adopt.go b/modules/repository/adopt.go index 21477ab7d7..3d895ac484 100644 --- a/modules/repository/adopt.go +++ b/modules/repository/adopt.go @@ -154,7 +154,7 @@ func ListUnadoptedRepositories(query string, opts *db.ListOptions) ([]string, in count := 0 // We're going to iterate by pagesize. - root := filepath.Join(setting.RepoRootPath) + root := filepath.Clean(setting.RepoRootPath) if err := filepath.Walk(root, func(path string, info os.FileInfo, err error) error { if err != nil { return err diff --git a/routers/web/user/setting/adopt.go b/routers/web/user/setting/adopt.go index e45a8a1324..2caccb69a5 100644 --- a/routers/web/user/setting/adopt.go +++ b/routers/web/user/setting/adopt.go @@ -27,7 +27,7 @@ func AdoptOrDeleteRepository(ctx *context.Context) { action := ctx.FormString("action") ctxUser := ctx.User - root := filepath.Join(models.UserPath(ctxUser.LowerName)) + root := models.UserPath(ctxUser.LowerName) // check not a repo has, err := models.IsRepositoryExist(ctxUser, dir) diff --git a/routers/web/user/setting/profile.go b/routers/web/user/setting/profile.go index 4a09006150..d7aa3264c5 100644 --- a/routers/web/user/setting/profile.go +++ b/routers/web/user/setting/profile.go @@ -250,7 +250,7 @@ func Repos(ctx *context.Context) { repoNames := make([]string, 0, setting.UI.Admin.UserPagingNum) repos := map[string]*models.Repository{} // We're going to iterate by pagesize. - root := filepath.Join(models.UserPath(ctxUser.Name)) + root := models.UserPath(ctxUser.Name) if err := filepath.Walk(root, func(path string, info os.FileInfo, err error) error { if err != nil { if os.IsNotExist(err) { diff --git a/services/pull/merge.go b/services/pull/merge.go index f59931e1bf..e4ed4e38bd 100644 --- a/services/pull/merge.go +++ b/services/pull/merge.go @@ -275,8 +275,8 @@ func rawMerge(pr *models.PullRequest, doer *models.User, mergeStyle models.Merge filepath.Join(tmpBasePath, ".git", "rebase-merge", "stopped-sha"), // Git >= 2.26 } for _, failingCommitPath := range failingCommitPaths { - if _, statErr := os.Stat(filepath.Join(failingCommitPath)); statErr == nil { - commitShaBytes, readErr := os.ReadFile(filepath.Join(failingCommitPath)) + if _, statErr := os.Stat(failingCommitPath); statErr == nil { + commitShaBytes, readErr := os.ReadFile(failingCommitPath) if readErr != nil { // Abandon this attempt to handle the error log.Error("git rebase staging on to base [%s:%s -> %s:%s]: %v\n%s\n%s", pr.HeadRepo.FullName(), pr.HeadBranch, pr.BaseRepo.FullName(), pr.BaseBranch, err, outbuf.String(), errbuf.String()) |