git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] rev-parse: respect core.hooksPath in --git-path

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Aug 16, 2016, 12:42 UTC
Message-ID
<alpine.DEB.2.20.1608161440290.4924@virtualbox>
In-Reply-To
<20160815125006.qdssqgd4rzjw4vi5@sigill.intra.peff.net>
Hi Peff,
On Mon, 15 Aug 2016, Jeff King wrote:
Show 33 quoted lines
> 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

Previous: Jeff KingNext: Jeff King
Message 3 of 11 in “rev-parse: respect core.hooksPath in --git-path”
  1. rev-parse: respect core.hooksPath in --git-pathJohannes Schindelin, Aug 15, 2016
  2. Jeff KingAug 15, 2016
  3. Johannes SchindelinAug 16, 2016
  4. Jeff KingAug 16, 2016
  5. rev-parse: respect core.hooksPath in --git-pathJohannes Schindelin, Aug 16, 2016
  6. Remi Galan AlfonsoAug 16, 2016
  7. Johannes SchindelinAug 16, 2016
  8. Remi Galan AlfonsoAug 16, 2016
  9. Junio C HamanoAug 16, 2016
  10. Remi Galan AlfonsoAug 17, 2016
  11. Junio C HamanoAug 17, 2016

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.