Pass correct value to git color based on args.color

mandarvaze · mandarvaze · commit 3d7b374bef1e · 2019-06-01T17:33:27.000+05:30
diff --git a/pre_commit/commands/run.py b/pre_commit/commands/run.py
@@ -224,9 +224,11 @@ def _run_hooks(config, hooks, args, environ):
                 '`pre-commit install`.',
             )
         output.write_line('All changes made by hooks:')
+        # args.color is a boolean.
+        # See user_color function in color.py
         subprocess.call((
             'git', '--no-pager', 'diff', '--no-ext-diff',
-            '--color={}'.format(args.color),
+            '--color={}'.format({True: 'always', False: 'never'}[args.color]),
         ))
 
     return retval
diff --git a/tests/commands/run_test.py b/tests/commands/run_test.py
@@ -184,15 +184,20 @@ def test_global_exclude(cap_out, store, tempdir_factory):
         (
             {
                 '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:',
         ),
         (
             {
                 '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
`@@ -184,15 +184,20 @@ def test_global_exclude(cap_out, store, tempdir_factory):`
`184`	`184`	`(`
`185`	`185`	`{`
`186`	`186`	`'show_diff_on_failure': True,`
`187`		`- 'color': 'auto',`
	`187`	`+ },`
	`188`	`+ b'All changes made by hooks:',`
	`189`	`+ ),`
	`190`	`+ (`
	`191`	`+ {`
	`192`	`+ 'show_diff_on_failure': True,`
	`193`	`+ 'color': True,`
`188`	`194`	`},`
`189`	`195`	`b'All changes made by hooks:',`
`190`	`196`	`),`
`191`	`197`	`(`
`192`	`198`	`{`
`193`	`199`	`'show_diff_on_failure': True,`
`194`	`200`	`'all_files': True,`
`195`		`- 'color': 'auto',`
`196`	`201`	`},`
`197`	`202`	`b'reproduce locally with: pre-commit run --all-files',`
`198`	`203`	`),`