git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Phillip Wood <phillip.wood123@gmail.com>
To: Eric Sunshine <sunshine@sunshineco.com>,
	Antoine Bolvy <antoine.bolvy@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [bug report] git diff --relative not doing well with worktree in hooks
Date: Mon, 3 Jun 2024 10:29:56 +0100	[thread overview]
Message-ID: <e0ea930f-3d43-49de-b2e7-c057d95fd7cc@gmail.com> (raw)
In-Reply-To: <CAPig+cT1pTkKd1A0o_qjP+Oyx+zyCevV8EAg5Ub9guAyd3UjgA@mail.gmail.com>

Hi Eric

On 31/05/2024 22:42, Eric Sunshine wrote:
> On Fri, May 31, 2024 at 7:38 AM Antoine Bolvy <antoine.bolvy@gmail.com> wrote:
>> The path is no longer show relative. This causes issues with more complex
>> scripts.
> 
> I'm not sure there's a satisfactory resolution here. Your hook is
> running afoul of the environment variables Git sets up when the hook
> is run outside of the "main" worktree.
> [...] 
> The relevant portion from the "githooks" manual page is:
> 
>      Environment variables, such as GIT_DIR, GIT_WORK_TREE, etc., are
>      exported so that Git commands run by the hook can correctly locate
>      the repository. If your hook needs to invoke Git commands in a
>      foreign repository or in a different working tree of the same
>      repository, then it should clear these environment variables so
>      they do not interfere with Git operations at the foreign
>      location. For example:

Maybe I'm missing something but in Antonine's example the hook is being 
run in the same worktree as the "git commit" - we're changing into a 
subdirectory of the worktree, not changing to a different worktree so 
why doesn't it work?

Best Wishes

Phillip

  parent reply	other threads:[~2024-06-03  9:30 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-05-31 11:38 [bug report] git diff --relative not doing well with worktree in hooks Antoine Bolvy
2024-05-31 21:42 ` Eric Sunshine
2024-06-03  8:38   ` Antoine Bolvy
2024-06-03  9:29   ` Phillip Wood [this message]
2024-06-03 21:59     ` Eric Sunshine

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=e0ea930f-3d43-49de-b2e7-c057d95fd7cc@gmail.com \
    --to=phillip.wood123@gmail.com \
    --cc=antoine.bolvy@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=phillip.wood@dunelm.org.uk \
    --cc=sunshine@sunshineco.com \
    /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.
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 NNTP newsgroup(s).