Skip to content

Commit

Permalink
readme: fix typo in sample config.
Browse files Browse the repository at this point in the history
Should be `max-same-issues`, not `max-same`.

Also adds a trailing newline to files, which is good form, and updates
the generator to handle that cleanly.

Fixes #216.
  • Loading branch information
diegs authored and jirfag committed Oct 20, 2018
1 parent 1759c57 commit 9f0dcd6
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .golangci.example.yml
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ issues:
max-per-linter: 0

# Maximum count of issues with the same text. Set to 0 to disable. Default is 3.
max-same: 0
max-same-issues: 0

# Show only new issues: if there are unstaged changes or untracked files,
# only those changes are analyzed, else only changes in HEAD~ are analyzed.
Expand All @@ -189,4 +189,4 @@ issues:
new-from-rev: REV

# Show only new issues created in git patch with set file path.
new-from-patch: path/to/patch/file
new-from-patch: path/to/patch/file
2 changes: 1 addition & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ linters:
disable:
- maligned
- prealloc
- gosec
- gosec
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -612,7 +612,7 @@ issues:
max-per-linter: 0

# Maximum count of issues with the same text. Set to 0 to disable. Default is 3.
max-same: 0
max-same-issues: 0

# Show only new issues: if there are unstaged changes or untracked files,
# only those changes are analyzed, else only changes in HEAD~ are analyzed.
Expand Down
4 changes: 2 additions & 2 deletions scripts/gen_readme/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@ func buildTemplateContext() (map[string]interface{}, error) {
shortHelp := bytes.Join(helpLines[2:], []byte("\n"))

return map[string]interface{}{
"GolangciYaml": string(golangciYaml),
"GolangciYamlExample": string(golangciYamlExample),
"GolangciYaml": strings.TrimSpace(string(golangciYaml)),
"GolangciYamlExample": strings.TrimSpace(string(golangciYamlExample)),
"LintersCommandOutputEnabledOnly": string(lintersOutParts[0]),
"LintersCommandOutputDisabledOnly": string(lintersOutParts[1]),
"EnabledByDefaultLinters": getLintersListMarkdown(true),
Expand Down

0 comments on commit 9f0dcd6

Please sign in to comment.