summaryrefslogtreecommitdiff
path: root/git/index/fun.py
diff options
context:
space:
mode:
authorDavid Briscoe <idbrii@gmail.com>2022-01-12 23:39:10 -0800
committerSebastian Thiel <sebastian.thiel@icloud.com>2022-01-14 08:27:40 +0800
commitb719e1809c2c81283e930086faebd7d6050cd5d7 (patch)
treee6d3289d238621ba4a8bb83d3bbe307775bd9188 /git/index/fun.py
parentfac603789d66c0fd7c26e75debb41b06136c5026 (diff)
downloadgitpython-b719e1809c2c81283e930086faebd7d6050cd5d7.tar.gz
Use bash to open extensionless hooks on windows
Fix #971. Partly resolve #703. If the hook doesn't have a file extension, then Windows won't know how to run it and you'll get "[WinError 193] %1 is not a valid Win32 application". It's very likely that it's a shell script of some kind, so use bash.exe (commonly installed via Windows Subsystem for Linux). We don't want to run all hooks with bash because they could be .bat files. Update tests to get several hook ones working. More work necessary to get commit-msg hook working. The hook writes to the wrong file because it's not using forward slashes in the path: C:\Users\idbrii\AppData\Local\Temp\bare_test_commit_msg_hook_successy5fo00du\CUsersidbriiAppDataLocalTempbare_test_commit_msg_hook_successy5fo00duCOMMIT_EDITMSG
Diffstat (limited to 'git/index/fun.py')
-rw-r--r--git/index/fun.py15
1 files changed, 14 insertions, 1 deletions
diff --git a/git/index/fun.py b/git/index/fun.py
index 16ec744e..59fa1be1 100644
--- a/git/index/fun.py
+++ b/git/index/fun.py
@@ -3,6 +3,7 @@
# NOTE: Autodoc hates it if this is a docstring
from io import BytesIO
+from pathlib import Path
import os
from stat import (
S_IFDIR,
@@ -21,6 +22,7 @@ from git.compat import (
force_text,
force_bytes,
is_posix,
+ is_win,
safe_decode,
)
from git.exc import (
@@ -76,6 +78,10 @@ def hook_path(name: str, git_dir: PathLike) -> str:
return osp.join(git_dir, 'hooks', name)
+def _has_file_extension(path):
+ return osp.splitext(path)[1]
+
+
def run_commit_hook(name: str, index: 'IndexFile', *args: str) -> None:
"""Run the commit hook of the given name. Silently ignores hooks that do not exist.
:param name: name of hook, like 'pre-commit'
@@ -89,8 +95,15 @@ def run_commit_hook(name: str, index: 'IndexFile', *args: str) -> None:
env = os.environ.copy()
env['GIT_INDEX_FILE'] = safe_decode(str(index.path))
env['GIT_EDITOR'] = ':'
+ cmd = [hp]
try:
- cmd = subprocess.Popen([hp] + list(args),
+ if is_win and not _has_file_extension(hp):
+ # Windows only uses extensions to determine how to open files
+ # (doesn't understand shebangs). Try using bash to run the hook.
+ relative_hp = Path(hp).relative_to(index.repo.working_dir).as_posix()
+ cmd = ["bash.exe", relative_hp]
+
+ cmd = subprocess.Popen(cmd + list(args),
env=env,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,