Commit graph

721 commits

Author SHA1 Message Date
Anthony Sottile
b4e29b5e63 Use newline='' to avoid automatic newline translation 2016-05-26 11:45:28 -07:00
Anthony Sottile
4a01f64c8f Fix check-merge-conflict against binary files 2016-05-26 11:20:32 -07:00
Anthony Sottile
adbb569fe9 v0.5.1 2016-05-16 09:12:32 -07:00
Anthony Sottile
35548254ad Merge pull request #114 from wting/wting_support_diff3_conflictstyle
Add diff3 conflictstyle support for git merge conflicts.
2016-04-30 21:16:00 -07:00
William Ting
c92b46587d Add diff3 conflictstyle support for git merge conflicts. 2016-04-30 20:35:33 -07:00
Anthony Sottile
6f2b0a27e5 Merge pull request #111 from pre-commit/remove_coding_pragma
Add a --remove option to fix-encoding-pragma
2016-04-27 11:34:56 -07:00
Anthony Sottile
03bf17f2b0 Add a --remove option to fix-encoding-pragma 2016-04-27 11:18:14 -07:00
Anthony Sottile
17478a0a50 Style fixups 2016-04-14 08:25:52 -07:00
Anthony Sottile
ea867c2e68 Merge pull request #109 from mattclegg/no-sort-keys
Adding no-sort-keys to pretty_format_json
2016-04-14 08:11:26 -07:00
mattclegg
f775891717 Drop messy py26 support in favour of 100% coverage 2016-04-14 11:16:18 +01:00
mattclegg
d49f04c69e Adjust formatting for existing test_pretty_format_json 2016-04-14 10:41:39 +01:00
mattclegg
bd4e37c366 Add test for '--no-sort-keys' 2016-04-14 10:41:39 +01:00
mattclegg
700b18ed0e Use OrderedDict to preserve order 2016-04-14 10:23:42 +01:00
Anthony Sottile
ff65d01841 v0.5.0 2016-04-05 10:52:44 -07:00
Ken Struys
44e1753f98 Merge pull request #107 from pre-commit/utf8_bom
Forbid files with a UTF-8 BOM
2016-03-18 11:52:56 -07:00
Anthony Sottile
fe9c404019 Forbid files with a UTF-8 BOM 2016-03-18 10:59:31 -07:00
Sébastien Larivière
f769c208bc Addding no-sort-keys to pretty_format_json, this allows to disable the sort on the keys 2016-03-12 17:04:33 -05:00
Anthony Sottile
97b88d9610 flake8 2.5.3 is broken: https://gitlab.com/pycqa/flake8/issues/119 2016-02-11 09:46:10 -08:00
Anthony Sottile
36214cb67b Merge pull request #102 from pre-commit/improve_error_message_aws_101
Improve error message when credentials file is not provided
2016-02-08 17:31:33 -08:00
Anthony Sottile
d444ab821d Improve error message when credentials file is not provided 2016-02-08 17:18:56 -08:00
Anthony Sottile
d740faeded Typo in no cover comment 2016-02-03 11:12:51 -08:00
Anthony Sottile
64943e8641 Add metadata for check-symlinks 2016-01-15 07:47:33 -08:00
Anthony Sottile
8d80d51cad Fix coverage on check_symlinks for windows 2016-01-15 07:41:58 -08:00
Anthony Sottile
eff3eafcbb Merge pull request #98 from bchess/check_symlinks
New hook tests for broken symlinks
2016-01-15 07:38:46 -08:00
Ben Chess
ee1e98a884 Merge pull request #1 from pre-commit/asottile_check_symlinks
Skip the symlink tests on windows
2016-01-15 10:36:20 -05:00
Anthony Sottile
da882286e3 Skip the symlink tests on windows 2016-01-14 19:03:11 -08:00
Anthony Sottile
d466a2e52c no cover some non-lfs lines 2016-01-14 18:57:03 -08:00
Benjamin Chess
896c0cfdc0 new hook tests for broken symlinks 2016-01-14 15:25:46 -08:00
Anthony Sottile
5edf945ca5 Merge pull request #96 from pre-commit/git_lfs
Teach check-large-files-added about git-lfs.  Reslves #82.
2016-01-04 14:05:19 -05:00
Anthony Sottile
3f6f23d73f Teach check-large-files-added about git-lfs. Reslves #82. 2015-12-28 05:38:06 -08:00
Anthony Sottile
2c62e4aafc Merge pull request #97 from pre-commit/dont_write_files_that_arent_cleaned_up
Write to temp directories in such a way that files get cleaned up
2015-12-26 14:11:10 -05:00
Anthony Sottile
7376a29d69 Write to temp directories in such a way that files get cleaned up 2015-12-26 10:58:33 -08:00
Anthony Sottile
61d3e60a20 Merge pull request #95 from pre-commit/run_pre_commit_during_test
Run pre-commit during test
2015-12-25 12:48:48 -05:00
Anthony Sottile
3a3a7a153a Run pre-commit during test 2015-12-25 09:42:17 -08:00
Anthony Sottile
e306ff3b7d Merge pull request #91 from SBoudrias/patch-1
Fix code syntax in README
2015-12-01 16:08:52 -08:00
Simon Boudrias
3284a1aa57 Fix code syntax in README 2015-12-01 15:42:07 -08:00
Anthony Sottile
78fd6916dd Merge pull request #90 from cchristous/master
Reformatted --diff-filter git argument
2015-12-01 14:05:54 -08:00
Corey Christous
a23c58298c Reformatted --diff-filter git argument
This makes the command compatible with older versions of git.
2015-12-01 16:59:22 -05:00
Anthony Sottile
0ff8620e03 Merge pull request #89 from phoxelua/master
Fixed regex matching for django test file names
2015-11-19 06:43:08 -08:00
phoxelua
58edfc8af6 Fixed regex matching 2015-11-19 00:39:29 -08:00
Anthony Sottile
daa1e9a837 Merge pull request #87 from pre-commit/encoding_pragma_hook
Add encoding pragma hook.  Resolves pre-commit/pre-commit#15
2015-11-13 14:09:44 -08:00
Anthony Sottile
aa2ba6f94f Add encoding pragma hook. Resolves pre-commit/pre-commit#15 2015-11-13 12:39:43 -08:00
Anthony Sottile
29bf11d136 Merge pull request #85 from deanwilson/aws_detected_filenames
Show names of files containing aws credentials
2015-10-28 09:50:57 -07:00
Dean Wilson
a6665279e7 Show names of files containing aws credentials 2015-10-28 05:13:37 +00:00
Anthony Sottile
edb5d5219e Merge pull request #84 from pre-commit/update_description_about_autopep8
Update description about autopep8.  Closes #83
2015-10-18 12:36:53 -07:00
Anthony Sottile
44fbe61e3d Update description about autopep8. Closes #83 2015-10-18 12:36:14 -07:00
Anthony Sottile
f82fb149af Add C, C++ to whitespace hooks 2015-09-23 13:29:30 -07:00
Anthony Sottile
616c1ebd18 Merge pull request #79 from chriskuehl/requirements-sorter-nocase
Sort requirements.txt case-insensitively
2015-08-17 12:55:56 -07:00
Chris Kuehl
a1b0104f3d Sort requirements.txt case-insensitively 2015-08-17 12:43:13 -07:00
Anthony Sottile
c2992bd3a1 Merge pull request #77 from pre-commit/check_ast_hook
Add a hook to verify python ast.
2015-08-04 13:58:11 -07:00