Pass color option to git diff unconditionally

mandarvaze · mandarvaze · commit 64f0178b75c7 · 2019-06-01T07:40:20.000+05:30
diff --git a/pre_commit/commands/run.py b/pre_commit/commands/run.py
@@ -224,13 +224,10 @@ def _run_hooks(config, hooks, args, environ):
                 '`pre-commit install`.',
             )
         output.write_line('All changes made by hooks:')
-        if args.color:
-            subprocess.call((
-                'git', '--no-pager', 'diff', '--no-ext-diff',
-                '--color={}'.format(args.color),
-            ))
-        else:
-            subprocess.call(('git', '--no-pager', 'diff', '--no-ext-diff'))
+        subprocess.call((
+            'git', '--no-pager', 'diff', '--no-ext-diff',
+            '--color={}'.format(args.color),
+        ))
 
     return retval
 
diff --git a/tests/commands/run_test.py b/tests/commands/run_test.py
@@ -181,12 +181,6 @@ def test_global_exclude(cap_out, store, tempdir_factory):
 @pytest.mark.parametrize(
     ('args', 'expected_out'),
     [
-        (
-            {
-                'show_diff_on_failure': True,
-            },
-            b'All changes made by hooks:',
-        ),
         (
             {
                 'show_diff_on_failure': True,
@@ -198,6 +192,7 @@ def test_global_exclude(cap_out, store, tempdir_factory):
             {
                 'show_diff_on_failure': True,
                 'all_files': True,
+                'color': 'auto',
             },
             b'reproduce locally with: pre-commit run --all-files',
         ),

Original file line number	Diff line number	Diff line change
`@@ -181,12 +181,6 @@ def test_global_exclude(cap_out, store, tempdir_factory):`
`181`	`181`	`@pytest.mark.parametrize(`
`182`	`182`	`('args', 'expected_out'),`
`183`	`183`	`[`
`184`		`- (`
`185`		`- {`
`186`		`- 'show_diff_on_failure': True,`
`187`		`- },`
`188`		`- b'All changes made by hooks:',`
`189`		`- ),`
`190`	`184`	`(`
`191`	`185`	`{`
`192`	`186`	`'show_diff_on_failure': True,`
`@@ -198,6 +192,7 @@ def test_global_exclude(cap_out, store, tempdir_factory):`
`198`	`192`	`{`
`199`	`193`	`'show_diff_on_failure': True,`
`200`	`194`	`'all_files': True,`
	`195`	`+ 'color': 'auto',`
`201`	`196`	`},`
`202`	`197`	`b'reproduce locally with: pre-commit run --all-files',`
`203`	`198`	`),`