From: Josh Steadmon <steadmon@google.com>
To: Emily Shaffer <emilyshaffer@google.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 08/17] git-p4: use 'git hook' to run hooks
Date: Tue, 15 Dec 2020 16:27:12 -0800 [thread overview]
Message-ID: <20201216002712.GP36751@google.com> (raw)
In-Reply-To: <20201205014945.1502660-9-emilyshaffer@google.com>
On 2020.12.04 17:49, Emily Shaffer wrote:
> diff --git a/git-p4.py b/git-p4.py
> index 6ae5bbfe99..73161a56d9 100755
> --- a/git-p4.py
> +++ b/git-p4.py
> @@ -208,70 +208,18 @@ def decode_path(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):
> + print('ESS: entering run_git_hook')
Looks like a stray debug message here?
> + if not cmd:
> 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>"""
> + args = (['git', 'hook', 'run'] +
> + ["-a" + arg for arg in param] +
> + [cmd])
> + print ('ESS: args:')
Here as well.
> + print (args)
>
> + return subprocess.call(args) == 0
>
> def write_pipe(c, stdin):
> if verbose:
> --
> 2.28.0.rc0.142.g3c755180ce-goog
>
next prev parent reply other threads:[~2020-12-16 0:28 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-14 23:25 [PATCH] commit: use config-based hooks (config-based hooks part II) Emily Shaffer
2020-10-16 18:34 ` Junio C Hamano
2020-12-05 1:49 ` [PATCH 00/17] use config-based hooks (config-based hooks part Emily Shaffer
2020-12-05 1:49 ` [PATCH 01/17] commit: use config-based hooks Emily Shaffer
2020-12-05 1:49 ` [PATCH 02/17] am: convert applypatch hooks to use config Emily Shaffer
2020-12-05 1:49 ` [PATCH 03/17] merge: use config-based hooks for post-merge hook Emily Shaffer
2020-12-05 1:49 ` [PATCH 04/17] gc: use hook library for pre-auto-gc hook Emily Shaffer
2020-12-05 1:49 ` [PATCH 05/17] rebase: teach pre-rebase to use hook.h Emily Shaffer
2020-12-05 1:49 ` [PATCH 06/17] read-cache: convert post-index-change hook to use config Emily Shaffer
2020-12-05 1:49 ` [PATCH 07/17] receive-pack: convert push-to-checkout hook to hook.h Emily Shaffer
2020-12-05 1:49 ` [PATCH 08/17] git-p4: use 'git hook' to run hooks Emily Shaffer
2020-12-16 0:27 ` Josh Steadmon [this message]
2020-12-16 20:19 ` Emily Shaffer
2020-12-05 1:49 ` [PATCH 09/17] hooks: convert 'post-checkout' hook to hook library Emily Shaffer
2020-12-05 1:49 ` [PATCH 10/17] hook: convert 'post-rewrite' hook to config Emily Shaffer
2020-12-08 23:02 ` Josh Steadmon
2020-12-15 23:42 ` Emily Shaffer
2020-12-05 1:49 ` [PATCH 11/17] transport: convert pre-push hook to use config Emily Shaffer
2020-12-05 1:49 ` [PATCH 12/17] reference-transaction: look for hooks in config Emily Shaffer
2020-12-05 1:49 ` [PATCH 13/17] receive-pack: convert 'update' hook to hook.h Emily Shaffer
2020-12-05 1:49 ` [PATCH 14/17] proc-receive: acquire hook list from hook.h Emily Shaffer
2020-12-05 1:49 ` [PATCH 15/17] post-update: use hook.h library Emily Shaffer
2020-12-05 1:49 ` [PATCH 16/17] receive-pack: convert receive hooks to hook.h Emily Shaffer
2020-12-05 1:49 ` [PATCH 17/17] run-command: stop thinking about hooks Emily Shaffer
2020-12-22 0:04 ` [PATCH v3 00/17] use config-based hooks (config-based hooks part II) Emily Shaffer
2020-12-22 0:04 ` [PATCH v3 01/17] commit: use config-based hooks Emily Shaffer
2021-02-01 22:08 ` Junio C Hamano
2021-03-10 19:51 ` Emily Shaffer
2021-03-10 22:36 ` Junio C Hamano
2021-02-01 23:02 ` Junio C Hamano
2021-03-10 19:39 ` Emily Shaffer
2020-12-22 0:04 ` [PATCH v3 02/17] am: convert applypatch hooks to use config Emily Shaffer
2021-02-01 22:05 ` Junio C Hamano
2020-12-22 0:04 ` [PATCH v3 03/17] merge: use config-based hooks for post-merge hook Emily Shaffer
2020-12-22 0:04 ` [PATCH v3 04/17] gc: use hook library for pre-auto-gc hook Emily Shaffer
2020-12-22 0:04 ` [PATCH v3 05/17] rebase: teach pre-rebase to use hook.h Emily Shaffer
2020-12-22 0:04 ` [PATCH v3 06/17] read-cache: convert post-index-change hook to use config Emily Shaffer
2020-12-22 0:04 ` [PATCH v3 07/17] receive-pack: convert push-to-checkout hook to hook.h Emily Shaffer
2020-12-22 0:04 ` [PATCH v3 08/17] git-p4: use 'git hook' to run hooks Emily Shaffer
2020-12-22 0:04 ` [PATCH v3 09/17] hooks: convert 'post-checkout' hook to hook library Emily Shaffer
2020-12-22 0:04 ` [PATCH v3 10/17] hook: convert 'post-rewrite' hook to config Emily Shaffer
2020-12-22 0:04 ` [PATCH v3 11/17] transport: convert pre-push hook to use config Emily Shaffer
2020-12-22 0:04 ` [PATCH v3 12/17] reference-transaction: look for hooks in config Emily Shaffer
2020-12-22 0:04 ` [PATCH v3 13/17] receive-pack: convert 'update' hook to hook.h Emily Shaffer
2020-12-22 0:04 ` [PATCH v3 14/17] proc-receive: acquire hook list from hook.h Emily Shaffer
2020-12-22 0:04 ` [PATCH v3 15/17] post-update: use hook.h library Emily Shaffer
2020-12-22 0:04 ` [PATCH v3 16/17] receive-pack: convert receive hooks to hook.h Emily Shaffer
2020-12-22 0:04 ` [PATCH v3 17/17] run-command: stop thinking about hooks Emily Shaffer
2020-12-28 19:59 ` [PATCH v3 00/17] use config-based hooks (config-based hooks part II) Emily Shaffer
2020-12-28 22:40 ` [PATCH v3 18/17] doc: make git-hook.txt point of truth Emily Shaffer
2020-12-28 23:15 ` Emily Shaffer
2021-02-18 22:32 ` [PATCH v3 00/17] use config-based hooks (config-based hooks part II) Josh Steadmon
2020-12-16 0:31 ` [PATCH] commit: " Josh Steadmon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201216002712.GP36751@google.com \
--to=steadmon@google.com \
--cc=emilyshaffer@google.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).