Merge pull request #1051 from mandarvaze/master

asottile · web-flow · commit a75fe69984b1 · 2019-06-01T08:11:45.000-07:00
Pass color option to git diff (on failure)
diff --git a/pre_commit/commands/run.py b/pre_commit/commands/run.py
@@ -224,7 +224,13 @@ def _run_hooks(config, hooks, args, environ):
                 '`pre-commit install`.',
             )
         output.write_line('All changes made by hooks:')
-        subprocess.call(('git', '--no-pager', 'diff', '--no-ext-diff'))
+        # args.color is a boolean.
+        # See user_color function in color.py
+        subprocess.call((
+            'git', '--no-pager', 'diff', '--no-ext-diff',
+            '--color={}'.format({True: 'always', False: 'never'}[args.color]),
+        ))
+
     return retval
 
 
diff --git a/tests/commands/run_test.py b/tests/commands/run_test.py
@@ -187,6 +187,13 @@ def test_global_exclude(cap_out, store, tempdir_factory):
             },
             b'All changes made by hooks:',
         ),
+        (
+            {
+                'show_diff_on_failure': True,
+                'color': True,
+            },
+            b'All changes made by hooks:',
+        ),
         (
             {
                 'show_diff_on_failure': True,

Original file line number	Diff line number	Diff line change
`@@ -187,6 +187,13 @@ def test_global_exclude(cap_out, store, tempdir_factory):`
`187`	`187`	`},`
`188`	`188`	`b'All changes made by hooks:',`
`189`	`189`	`),`
	`190`	`+ (`
	`191`	`+ {`
	`192`	`+ 'show_diff_on_failure': True,`
	`193`	`+ 'color': True,`
	`194`	`+ },`
	`195`	`+ b'All changes made by hooks:',`
	`196`	`+ ),`
`190`	`197`	`(`
`191`	`198`	`{`
`192`	`199`	`'show_diff_on_failure': True,`