Merge pull request #2136 from emzeat/fix/git_config_env

asottile · web-flow · commit 36e9514e032e · 2021-11-22T20:17:34.000-05:00
support gitconfig from env
diff --git a/pre_commit/git.py b/pre_commit/git.py
@@ -41,9 +41,10 @@ def no_git_env(
     return {
         k: v for k, v in _env.items()
         if not k.startswith('GIT_') or
+        k.startswith(('GIT_CONFIG_KEY_', 'GIT_CONFIG_VALUE_')) or
         k in {
             'GIT_EXEC_PATH', 'GIT_SSH', 'GIT_SSH_COMMAND', 'GIT_SSL_CAINFO',
-            'GIT_SSL_NO_VERIFY',
+            'GIT_SSL_NO_VERIFY', 'GIT_CONFIG_COUNT',
         }
     }
 
diff --git a/tests/git_test.py b/tests/git_test.py
@@ -227,13 +227,23 @@ def test_no_git_env():
         'GIT_SSH': '/usr/bin/ssh',
         'GIT_SSH_COMMAND': 'ssh -o',
         'GIT_DIR': '/none/shall/pass',
+        'GIT_CONFIG_KEY_0': 'user.name',
+        'GIT_CONFIG_VALUE_0': 'anthony',
+        'GIT_CONFIG_KEY_1': 'user.email',
+        'GIT_CONFIG_VALUE_1': 'asottile@example.com',
+        'GIT_CONFIG_COUNT': '2',
     }
     no_git_env = git.no_git_env(env)
     assert no_git_env == {
         'http_proxy': 'http://myproxy:80',
         'GIT_EXEC_PATH': '/some/git/exec/path',
         'GIT_SSH': '/usr/bin/ssh',
         'GIT_SSH_COMMAND': 'ssh -o',
+        'GIT_CONFIG_KEY_0': 'user.name',
+        'GIT_CONFIG_VALUE_0': 'anthony',
+        'GIT_CONFIG_KEY_1': 'user.email',
+        'GIT_CONFIG_VALUE_1': 'asottile@example.com',
+        'GIT_CONFIG_COUNT': '2',
     }
 
 

Original file line number	Diff line number	Diff line change
`@@ -41,9 +41,10 @@ def no_git_env(`
`41`	`41`	`return {`
`42`	`42`	`k: v for k, v in _env.items()`
`43`	`43`	`if not k.startswith('GIT_') or`
	`44`	`+ k.startswith(('GIT_CONFIG_KEY_', 'GIT_CONFIG_VALUE_')) or`
`44`	`45`	`k in {`
`45`	`46`	`'GIT_EXEC_PATH', 'GIT_SSH', 'GIT_SSH_COMMAND', 'GIT_SSL_CAINFO',`
`46`		`- 'GIT_SSL_NO_VERIFY',`
	`47`	`+ 'GIT_SSL_NO_VERIFY', 'GIT_CONFIG_COUNT',`
`47`	`48`	`}`
`48`	`49`	`}`
`49`	`50`