third-party/pre-commit
1
0
Fork 0
mirror of https://github.com/pre-commit/pre-commit.git synced 2026-02-17 08:14:42 +04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Pass correct value to git color based on args.color

Browse source
This commit is contained in:
Mandar Vaze 2019-06-01 17:33:27 +05:30
parent 64f0178b75
commit 3d7b374bef
2 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pre_commit/commands/run.py
View file

@ -224,9 +224,11 @@ def _run_hooks(config, hooks, args, environ):
'`pre-commit install`.', '`pre-commit install`.',
) )
output.write_line('All changes made by hooks:') output.write_line('All changes made by hooks:')
# args.color is a boolean.
# See user_color function in color.py
subprocess.call(( subprocess.call((
'git', '--no-pager', 'diff', '--no-ext-diff', 'git', '--no-pager', 'diff', '--no-ext-diff',
'--color={}'.format(args.color), '--color={}'.format({True: 'always', False: 'never'}[args.color]),
)) ))
return retval return retval

9
tests/commands/run_test.py
View file

@ -184,7 +184,13 @@ def test_global_exclude(cap_out, store, tempdir_factory):
( (
{ {
'show_diff_on_failure': True, 'show_diff_on_failure': True,
'color': 'auto', },
b'All changes made by hooks:',
),
(
{
'show_diff_on_failure': True,
'color': True,
}, },
b'All changes made by hooks:', b'All changes made by hooks:',
), ),
@ -192,7 +198,6 @@ def test_global_exclude(cap_out, store, tempdir_factory):
{ {
'show_diff_on_failure': True, 'show_diff_on_failure': True,
'all_files': True, 'all_files': True,
'color': 'auto',
}, },
b'reproduce locally with: pre-commit run --all-files', b'reproduce locally with: pre-commit run --all-files',
), ),