Hi Peff, On Mon, 15 Aug 2016, Jeff King wrote: > On Mon, Aug 15, 2016 at 02:43:18PM +0200, Johannes Schindelin wrote: > > > The idea of the --git-path option is not only to avoid having to > > prefix paths with the output of --git-dir all the time, but also to > > respect overrides for specific common paths inside the .git directory > > (e.g. `git rev-parse --git-path objects` will report the value of > > the environment variable GIT_OBJECT_DIRECTORY, if set). > > > > When introducing the core.hooksPath setting, we forgot to adjust > > git_path() accordingly. This patch fixes that. > > Makes sense. > > I think you can squash in: > > diff --git a/run-command.c b/run-command.c > index 33bc63a..5a4dbb6 100644 > --- a/run-command.c > +++ b/run-command.c > @@ -824,10 +824,7 @@ const char *find_hook(const char *name) > static struct strbuf path = STRBUF_INIT; > > strbuf_reset(&path); > - if (git_hooks_path) > - strbuf_addf(&path, "%s/%s", git_hooks_path, name); > - else > - strbuf_git_path(&path, "hooks/%s", name); > + strbuf_git_path(&path, "hooks/%s", name); > if (access(path.buf, X_OK) < 0) > return NULL; > return path.buf; > > as strbuf_git_path() handles this now. Good point. BTW in light of the discussion we are having elsewhere I just need to point out that it was *dramatically* faster for me to edit run-command.c, find "hooks/" and adjust the code manually than it would have been to save the diff and apply it. That's because I do not have advanced tooling on top of email (and I also could not handle mutt, so I am stuck with a not-really-scriptable email client). Just sayin'. Ciao, Dscho -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html