Re: [PATCH] git-gui - use git-hook, honor core.hooksPath
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Sep 18, 2023, 15:27 UTC
- Message-ID
- <a6998d64-32a7-80b6-f75c-d983ac6130dd@gmx.de>
- In-Reply-To
- <20230917192431.101775-1-mlevedahl@gmail.com>
Hi Mark,
On Sun, 17 Sep 2023, Mark Levedahl wrote:
Show 55 quoted lines
> git-gui currently runs some hooks directly using its own code written
> before 2010, long predating git v2.9 that added the core.hooksPath
> configuration to override the assumed location at $GIT_DIR/hooks. Thus,
> git-gui looks for and runs hooks including prepare-commit-msg,
> commit-msg, pre-commit, post-commit, and post-checkout from
> $GIT_DIR/hooks, regardless of configuration. Commands (e.g., git-merge)
> that git-gui invokes directly do honor core.hooksPath, meaning the
> overall behaviour is inconsistent.
>
> Furthermore, since v2.36 git exposes its hook exection machinery via
> git-hook run, eliminating the need for others to maintain code
> duplicating that functionality. Using git-hook will both fix git-gui's
> current issues on hook configuration and (presumably) reduce the
> maintenance burden going forward. So, teach git-gui to use git-hook.
>
> Signed-off-by: Mark Levedahl <mlevedahl@gmail.com>
> ---
> git-gui.sh | 27 ++-------------------------
> 1 file changed, 2 insertions(+), 25 deletions(-)
>
> diff --git a/git-gui.sh b/git-gui.sh
> index 8603437..3e5907a 100755
> --- a/git-gui.sh
> +++ b/git-gui.sh
> @@ -661,31 +661,8 @@ proc git_write {args} {
> }
>
> proc githook_read {hook_name args} {
> - set pchook [gitdir hooks $hook_name]
> - lappend args 2>@1
> -
> - # On Windows [file executable] might lie so we need to ask
> - # the shell if the hook is executable. Yes that's annoying.
> - #
> - if {[is_Windows]} {
> - upvar #0 _sh interp
> - if {![info exists interp]} {
> - set interp [_which sh]
> - }
> - if {$interp eq {}} {
> - error "hook execution requires sh (not in PATH)"
> - }
> -
> - set scr {if test -x "$1";then exec "$@";fi}
> - set sh_c [list $interp -c $scr $interp $pchook]
> - return [_open_stdout_stderr [concat $sh_c $args]]
> - }
> -
> - if {[file executable $pchook]} {
> - return [_open_stdout_stderr [concat [list $pchook] $args]]
> - }
> -
> - return {}
> + set cmd [concat git hook run --ignore-missing $hook_name -- $args 2>@1]
> + return [_open_stdout_stderr $cmd]This looks so much nicer than the original code.
Thank you, Johannes
Show 7 quoted lines
> }
>
> proc kill_file_process {fd} {
> --
> 2.41.0.99.19
>
>