summaryrefslogtreecommitdiffstats
path: root/services/issue
diff options
context:
space:
mode:
authorsilverwind <me@silverwind.io>2024-04-22 13:48:42 +0200
committerEarl Warren <contact@earl-warren.org>2024-04-28 15:39:00 +0200
commit12b199c5e59dbb5a38ed368528c6b7b16412762b (patch)
treeca8e4a2c6da982c30d8e418618c37c016edbabbd /services/issue
parentRemove obsolete CSS text classes (#30576) (diff)
downloadforgejo-12b199c5e59dbb5a38ed368528c6b7b16412762b.tar.xz
forgejo-12b199c5e59dbb5a38ed368528c6b7b16412762b.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`. (cherry picked from commit 74f0c84fa4245a20ce6fb87dac1faf2aeeded2a2) Conflicts: .golangci.yml apply the linter recommendations to Forgejo code as well
Diffstat (limited to 'services/issue')
-rw-r--r--services/issue/commit.go9
1 files changed, 4 insertions, 5 deletions
diff --git a/services/issue/commit.go b/services/issue/commit.go
index e493a03211..8b927d52b6 100644
--- a/services/issue/commit.go
+++ b/services/issue/commit.go
@@ -117,7 +117,6 @@ func UpdateIssuesCommit(ctx context.Context, doer *user_model.User, repo *repo_m
var refIssue *issues_model.Issue
var err error
for _, ref := range references.FindAllIssueReferences(c.Message) {
-
// issue is from another repo
if len(ref.Owner) > 0 && len(ref.Name) > 0 {
refRepo, err = repo_model.GetRepositoryByOwnerAndName(ctx, ref.Owner, ref.Name)
@@ -185,15 +184,15 @@ func UpdateIssuesCommit(ctx context.Context, doer *user_model.User, repo *repo_m
continue
}
}
- close := ref.Action == references.XRefActionCloses
- if close && len(ref.TimeLog) > 0 {
+ isClosed := ref.Action == references.XRefActionCloses
+ if isClosed && len(ref.TimeLog) > 0 {
if err := issueAddTime(ctx, refIssue, doer, c.Timestamp, ref.TimeLog); err != nil {
return err
}
}
- if close != refIssue.IsClosed {
+ if isClosed != refIssue.IsClosed {
refIssue.Repo = refRepo
- if err := ChangeStatus(ctx, refIssue, doer, c.Sha1, close); err != nil {
+ if err := ChangeStatus(ctx, refIssue, doer, c.Sha1, isClosed); err != nil {
return err
}
}