On Fri, Oct 15, 2021 at 11:43:37AM +0200, Ævar Arnfjörð Bjarmason wrote:
>
>
> Instead of duplicating the behavior of run-command.h:run_hook_le() in
> Python, we can directly call 'git hook run'. We emulate the existence
> check with the --ignore-missing flag.
>
> As this is the last hook execution in git.git to not go through "git
> hook run" or the hook.[ch] library we can now be absolutely sure that
> our assertion in hook.c that only hooks known by the generated (from
> githooks(5)) hook-list.h are permitted.
>
> Signed-off-by: Emily Shaffer <emilyshaffer@xxxxxxxxxx>
> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx>
> ---
> git-p4.py | 72 ++++++-------------------------------------------------
> 1 file changed, 7 insertions(+), 65 deletions(-)
>
> diff --git a/git-p4.py b/git-p4.py
> index 2b4500226aa..1f24cbf0bca 100755
> --- a/git-p4.py
> +++ b/git-p4.py
> @@ -207,71 +207,13 @@ def decode_path(path):
> return path
>
> def run_git_hook(cmd, param=[]):
> - """Execute a hook if the hook exists."""
> - if verbose:
> - sys.stderr.write("Looking for hook: %s\n" % cmd)
> - sys.stderr.flush()
> -
> - hooks_path = gitConfig("core.hooksPath")
> - if len(hooks_path) <= 0:
> - hooks_path = os.path.join(os.environ["GIT_DIR"], "hooks")
> -
> - if not isinstance(param, list):
> - param=[param]
> -
> - # resolve hook file name, OS depdenent
> - hook_file = os.path.join(hooks_path, cmd)
> - if platform.system() == 'Windows':
> - if not os.path.isfile(hook_file):
> - # look for the file with an extension
> - files = glob.glob(hook_file + ".*")
> - if not files:
> - return True
> - files.sort()
> - hook_file = files.pop()
> - while hook_file.upper().endswith(".SAMPLE"):
> - # The file is a sample hook. We don't want it
> - if len(files) > 0:
> - hook_file = files.pop()
> - else:
> - return True
> -
> - if not os.path.isfile(hook_file) or not os.access(hook_file, os.X_OK):
> - return True
> -
> - return run_hook_command(hook_file, param) == 0
> -
> -def run_hook_command(cmd, param):
> - """Executes a git hook command
> - cmd = the command line file to be executed. This can be
> - a file that is run by OS association.
> -
> - param = a list of parameters to pass to the cmd command
> -
> - On windows, the extension is checked to see if it should
> - be run with the Git for Windows Bash shell. If there
> - is no file extension, the file is deemed a bash shell
> - and will be handed off to sh.exe. Otherwise, Windows
> - will be called with the shell to handle the file assocation.
> -
> - For non Windows operating systems, the file is called
> - as an executable.
> - """
> - cli = [cmd] + param
> - use_shell = False
> - if platform.system() == 'Windows':
> - (root,ext) = os.path.splitext(cmd)
> - if ext == "":
> - exe_path = os.environ.get("EXEPATH")
> - if exe_path is None:
> - exe_path = ""
> - else:
> - exe_path = os.path.join(exe_path, "bin")
> - cli = [os.path.join(exe_path, "SH.EXE")] + cli
> - else:
> - use_shell = True
> - return subprocess.call(cli, shell=use_shell)
> -
> + """args are specified with -a <arg> -a <arg> -a <arg>"""
Ah, the comment is misleading now, since we're adding args after the --.
> + args = ['git', 'hook', 'run', '--ignore-missing', cmd]
> + if param:
> + args.append("--")
> + for p in param:
> + args.append(p)
> + return subprocess.call(args) == 0
>
> def write_pipe(c, stdin):
> if verbose:
> --
> 2.33.1.1338.g20da966911a
>
