Re: [PATCH 1/1] respect core.hooksPath, falling back to .git/hooks

From: Bert Wesarg <bert.wesarg@googlemail.com>
Date: Sep 27, 2019, 06:10 UTC
Message-ID: <CAKPyHN1P713bTb2TYXFuXcM5Dg=7vXBVgchwvJUrNsQ6EcP5Rg@mail.gmail.com>
In-Reply-To: <20190926223638.6tk2qhc4e62hs2wt@yadavpratyush.com>

On Fri, Sep 27, 2019 at 12:40 AM Pratyush Yadav <me@yadavpratyush.com> wrote:

Show 44 quoted lines

>
> Hi,
>
> On 26/09/19 02:17PM, Johannes Schindelin via GitGitGadget wrote:
> > From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
> >
> > Since v2.9.0, Git knows about the config variable core.hookspath
> > that allows overriding the path to the directory containing the
> > Git hooks.
> >
> > Since v2.10.0, the `--git-path` option respects that config
> > variable, too, so we may just as well use that command.
> >
> > For Git versions older than v2.5.0 (which was the first version to
> > support the `--git-path` option for the `rev-parse` command), we
> > simply fall back to the previous code.
> >
> > This fixes https://github.com/git-for-windows/git/issues/1755
> >
> > Initial-patch-by: Philipp Gortan <philipp@gortan.org>
> > Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> > ---
> >  git-gui.sh | 6 +++++-
> >  1 file changed, 5 insertions(+), 1 deletion(-)
> >
> > diff --git a/git-gui.sh b/git-gui.sh
> > index fd476b6999..b2c6e7a1db 100755
> > --- a/git-gui.sh
> > +++ b/git-gui.sh
> > @@ -623,7 +623,11 @@ proc git_write {args} {
> >  }
> >
> >  proc githook_read {hook_name args} {
> > -     set pchook [gitdir hooks $hook_name]
> > +     if {[package vcompare $::_git_version 2.5.0] >= 0} {
> > +             set pchook [git rev-parse --git-path "hooks/$hook_name"]
> > +     } else {
> > +             set pchook [gitdir hooks $hook_name]
> > +     }
>
> gitdir is used in a lot of places, and I think all those would also
> benefit from using --git-path. So I think it is a better idea to move
> this to the procedure gitdir. It would have to be refactored to take any
> number of arguments, instead of the two it takes here.

gitdir already takes an arbitrary number of arguments and joins them to a path. The more imminent challenge is, that gitdir caches the GIT_DIR, thus it tries to avoid calling "git rev-parse". Which works for most, but not for hooks.

We could either maintain a blacklist, for what we cache the result too, or always call "git rev-parse --git-dir".

This blacklist would need to be in sync with the one in Git's path.c::adjust_git_path() than.

Bert

Show 6 quoted lines

>
> Other than that, looks good. Thanks.
>
> --
> Regards,
> Pratyush Yadav