diff options
| author | silverwind <me@silverwind.io> | 2024-04-22 13:48:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-22 11:48:42 +0000 |
| commit | 74f0c84fa4245a20ce6fb87dac1faf2aeeded2a2 (patch) | |
| tree | 94b0356bea5ad1cd24a523947cf001509a973be1 /services/gitdiff | |
| parent | aff7b7bdd285cc1fcabea774f153886e11ae9f5d (diff) | |
| download | gitea-74f0c84fa4245a20ce6fb87dac1faf2aeeded2a2.tar.gz gitea-74f0c84fa4245a20ce6fb87dac1faf2aeeded2a2.zip | |
Enable more `revive` linter rules (#30608)
Noteable additions:
- `redefines-builtin-id` forbid variable names that shadow go builtins
- `empty-lines` remove unnecessary empty lines that `gofumpt` does not
remove for some reason
- `superfluous-else` eliminate more superfluous `else` branches
Rules are also sorted alphabetically and I cleaned up various parts of
`.golangci.yml`.
Diffstat (limited to 'services/gitdiff')
| -rw-r--r-- | services/gitdiff/gitdiff.go | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/services/gitdiff/gitdiff.go b/services/gitdiff/gitdiff.go index b05c210a0c..d115686491 100644 --- a/services/gitdiff/gitdiff.go +++ b/services/gitdiff/gitdiff.go @@ -1044,10 +1044,10 @@ func createDiffFile(diff *Diff, line string) *DiffFile { // diff --git a/b b/b b/b b/b b/b b/b // midpoint := (len(line) + len(cmdDiffHead) - 1) / 2 - new, old := line[len(cmdDiffHead):midpoint], line[midpoint+1:] - if len(new) > 2 && len(old) > 2 && new[2:] == old[2:] { - curFile.OldName = old[2:] - curFile.Name = old[2:] + newPart, oldPart := line[len(cmdDiffHead):midpoint], line[midpoint+1:] + if len(newPart) > 2 && len(oldPart) > 2 && newPart[2:] == oldPart[2:] { + curFile.OldName = oldPart[2:] + curFile.Name = oldPart[2:] } } } @@ -1181,7 +1181,6 @@ func GetDiff(ctx context.Context, gitRepo *git.Repository, opts *DiffOptions, fi defer deferable() for _, diffFile := range diff.Files { - isVendored := optional.None[bool]() isGenerated := optional.None[bool]() if checker != nil { |