Merge branch 'feature/pre-commit-hook' into enforce-pre-commit

* feature/pre-commit-hook:
  In case we ARE committing to tabs now...
  Add a note on how to use the pre-commit yaml.
  Enforce some coding standards for the contributers
pull/1434/head
Ira Abramov 2020-03-10 10:52:27 +02:00
commit 30e47f224c
2 changed files with 24 additions and 8 deletions

View File

@ -1,8 +1,14 @@
# EditorConfig is awesome: http://EditorConfig.org # EditorConfig is awesome: http://EditorConfig.org
[*] [*]
indent_style = space indent_style = tab
indent_size = 2 indent_size = 1
shell_variant = bash
binary_next_line = true # like -bn
switch_case_indent = true # like -ci
space_redirects = true # like -sr
keep_padding = true # like -kp
end_of_line = lf end_of_line = lf
charset = utf-8 charset = utf-8
trim_trailing_whitespace = true trim_trailing_whitespace = true
@ -10,3 +16,17 @@ insert_final_newline = true
[*.md] [*.md]
trim_trailing_whitespace = false trim_trailing_whitespace = false
[*.*sh]
indent_style = tab
indent_size = 1
shell_variant = bash
binary_next_line = true # like -bn
switch_case_indent = true # like -ci
space_redirects = true # like -sr
keep_padding = true # like -kp
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true

View File

@ -18,10 +18,6 @@ repos:
- id: git-check # Configure in .gitattributes - id: git-check # Configure in .gitattributes
- id: shellcheck - id: shellcheck
- id: shfmt - id: shfmt
- repo: git://github.com/detailyang/pre-commit-shell
rev: 1.0.5
hooks:
- id: shell-lint
- repo: https://github.com/Lucas-C/pre-commit-hooks - repo: https://github.com/Lucas-C/pre-commit-hooks
rev: v1.1.7 rev: v1.1.7
hooks: hooks: