mirror/pre-commit
1
0
Fork 0
mirror of https://github.com/pre-commit/pre-commit.git synced 2026-01-15 13:30:17 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #177 from pre-commit/staged_files_only_176

Browse Source 
Fix staged_files_only for color.diff always.  Closes #176.
This commit is contained in:
Ken Struys
2014-10-07 18:00:20 -07:00
parent b2cb0f6fe6 0479f78b4d
commit 85aa1c428a
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pre_commit/staged_files_only.py
View File

@@ -21,7 +21,10 @@ def staged_files_only(cmd_runner):
"""
# Determine if there are unstaged files
retcode, diff_stdout_binary, _ = cmd_runner.run(
['git', 'diff', '--ignore-submodules', '--binary', '--exit-code'],
[
'git', 'diff', '--ignore-submodules', '--binary', '--exit-code',
'--no-color',
],
retcode=None,
encoding=None,
)

5
tests/staged_files_only_test.py
View File

@@ -70,6 +70,11 @@ def test_foo_something_unstaged(foo_staged, cmd_runner):
_test_foo_state(foo_staged, 'herp\nderp\n', 'AM')
def test_foo_something_unstaged_diff_color_always(foo_staged, cmd_runner):
cmd_output('git', 'config', '--local', 'color.diff', 'always')
test_foo_something_unstaged(foo_staged, cmd_runner)
def test_foo_both_modify_non_conflicting(foo_staged, cmd_runner):
with io.open(foo_staged.foo_filename, 'w') as foo_file:
foo_file.write(FOO_CONTENTS + '9\n')