Merge pull request redis#1193 from ferhatelmas/bump-golangci

Bump golangci-lint to v1.21.0
ma2331550908 · Nov 19, 2019 · 206581a · 206581a
2 parents da5cd5a + b403828
commit 206581a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -5,7 +5,11 @@ run:
 linters:
   enable-all: true
   disable:
+    - funlen
     - gochecknoglobals
+    - gocognit
     - goconst
+    - godox
     - gosec
     - maligned
+    - wsl
diff --git a/.travis.yml b/.travis.yml
@@ -20,4 +20,4 @@ env:
 go_import_path: github.com/go-redis/redis
 
 before_install:
-  - curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.17.1
+  - curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.21.0
diff --git a/command.go b/command.go
@@ -1863,7 +1863,6 @@ func (cmd *GeoPosCmd) readReply(rd *proto.Reader) error {
 		return nil, nil
 	})
 	return cmd.err
-
 }
 
 //------------------------------------------------------------------------------
-Original file line number
+Diff line change
@@ Expand Up / @@ -1863,7 +1863,6 @@ func (cmd *GeoPosCmd) readReply(rd *proto.Reader) error { @@
     		return nil, nil
     	})
     	return cmd.err
     }
     //------------------------------------------------------------------------------
@@ Expand Down @@