Git GUI does not execute commit hooks when running from a secondary worktree #1755

luismbo · 2018-07-09T16:58:40Z

I was not able to find an open or closed issue matching what I'm seeing

Setup

Which version of Git for Windows are you using? Is it 32-bit or 64-bit?

$ git --version --build-options

git version 2.17.0.windows.1
cpu: x86_64
built from commit: e7621d891d081acff6acd1f0ba6ae0adce06dd09
sizeof-long: 4

Which version of Windows are you running? Vista, 7, 8, 10? Is it 32-bit or 64-bit?

$ cmd.exe /c ver

Microsoft Windows [Version 10.0.17134.112]

What options did you set as part of the installation? Or did you choose the
defaults?

Portable version.

Any other interesting things about your environment that might be related
to the issue you're seeing?

Hopefully, no.

Details

Which terminal/shell are you running Git from? e.g Bash/CMD/PowerShell/other

Bash.

What commands did you run to trigger this issue? If you can provide a
Minimal, Complete, and Verifiable example
this will help us understand the issue.

mkdir foo
cd foo
git init

# set up a commit-msg hook that appends "The End" to commit messages
echo -e '#!/bin/sh\necho "The End" >> "$1"' > .git/hooks/commit-msg

touch file
git add file
git gui # commit; the commit-msg hook runs

# another commit, this time from a worktree
git branch master2
git worktree add ../foo-worktree master2
cd ../foo-worktree
echo "some change" >> file
git add file
git gui # commit; the commit-msg hook does NOT run

What did you expect to occur after running these commands?

I expected the commit created in foo-worktree would have "The End" appended by the commit-msg hook.

What actually happened instead?

The commit-msg hook appears to not have been executed. The commit message does not end with "The End".

The text was updated successfully, but these errors were encountered:

dscho · 2018-07-09T19:17:25Z

Probably the hooks directory is hard-coded or something.

Have you looked whether patthoyts/git-gui#12 or another PR that is still open in that repository fixes things for you?

luismbo · 2018-07-09T19:40:06Z

@dscho I've just tried your suggested patch at https://github.com/patthoyts/git-gui/pull/12/files#r121945479 and it fixes the problem.

(Indeed git rev-parse --git-path hooks/commit-msg within the secondary worktree returns a path pointing to the main .git directory.)

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 git-for-windows/git#1755 Initial-patch-by: Philipp Gortan <[email protected]> Signed-off-by: Johannes Schindelin <[email protected]>

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 git-for-windows#1755 Initial-patch-by: Philipp Gortan <[email protected]> Signed-off-by: Johannes Schindelin <[email protected]>

Let's try to address git-for-windows#1755 this way. Signed-off-by: Johannes Schindelin <[email protected]>

Git GUI [now handles hooks correctly](git-for-windows/git#1755) in worktrees other than the main one. Signed-off-by: Johannes Schindelin <[email protected]>

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 git-for-windows#1755 Initial-patch-by: Philipp Gortan <[email protected]> Signed-off-by: Johannes Schindelin <[email protected]>

Let's try to address git-for-windows#1755 this way. Signed-off-by: Johannes Schindelin <[email protected]>

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 #1755 Initial-patch-by: Philipp Gortan <[email protected]> Signed-off-by: Johannes Schindelin <[email protected]>

Let's try to address #1755 this way. Signed-off-by: Johannes Schindelin <[email protected]>