Merge pull request #3506 from saschagrunert/wasted-assigns

Fix wasted assigns

.golangci.yml

@@ -81,6 +81,7 @@ linters:
     - unparam
     - unused
     - usestdlibvars
+    - wastedassign
     - whitespace
     - zerologlint
     # - containedctx
@@ -120,7 +121,6 @@ linters:
     # - thelper
     # - tparallel
     # - varnamelen
-    # - wastedassign
     # - wrapcheck
     # - wsl
 linters-settings:

cmd/krel/cmd/release_notes.go

@@ -1122,7 +1122,6 @@ func fixReleaseNotes(workDir string, releaseNotes *notes.ReleaseNotes) error {
 	// Cycle all gathered release notes
 	for pr, note := range releaseNotes.ByPR() {
 		contentHash, err := note.ContentHash()
-		noteReviewed := false
 		if err != nil {
 			return fmt.Errorf("getting the content hash for PR#%d: %w", pr, err)
 		}
@@ -1190,7 +1189,7 @@ func fixReleaseNotes(workDir string, releaseNotes *notes.ReleaseNotes) error {
 			return fmt.Errorf("while asking to edit release note: %w", err)
 		}
 
-		noteReviewed = true
+		noteReviewed := true
 		if choice {
 			for {
 				retry, err := editReleaseNote(pr, workDir, originalNote, note)

pkg/consts/main.go

@@ -71,9 +71,8 @@ const (
 func IsSupported(field string, input, expected []string) bool {
 	notSupported := []string{}
 
-	supported := false
 	for _, i := range input {
-		supported = false
+		supported := false
 		for _, j := range expected {
 			if i == j {
 				supported = true

pkg/fastforward/fastforward.go

@@ -246,10 +246,8 @@ func (f *FastForward) Run() (err error) {
 
 	prepushMessage(f.RepoDir(repo), f.options.GitHubOrg, f.options.GitHubRepo, branch, f.options.MainRef, releaseRev, headRev)
 
-	pushUpstream := false
-	if f.options.NonInteractive {
-		pushUpstream = true
-	} else {
+	pushUpstream := f.options.NonInteractive
+	if !pushUpstream {
 		_, pushUpstream, err = f.Ask(pushUpstreamQuestion, "yes", 3)
 		if err != nil {
 			return fmt.Errorf("ask upstream question: %w", err)