Skip to content

hook: reset path before early hook lookup #1014

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Johannes Schindelin (dscho) merged 1 commit into from
Oct 27, 2026
Merged

hook: reset path before early hook lookup #1014

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions hook.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ const char *find_hook(struct repository *r, const char *name)

int found_hook;

strbuf_reset(&path);
if (!r || !r->gitdir) {
if (!hook_path_early(name, &path))
return NULL;
Expand Down
61 changes: 61 additions & 0 deletions t/t0401-post-command-hook.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,67 @@ test_expect_success 'with failing pre-command hook' '
test_path_is_missing "$(cat .git/post-command.out)"
'

write_order_hooks () {
write_script .git/hooks/pre-command <<-EOF &&
echo "pre \$1" >>"$PWD/order.log"
if test "\$1" = git-vanish
then
rm -f "$PWD/bin/git-vanish"
fi
EOF
write_script .git/hooks/post-command <<-EOF
echo "post \$1" >>"$PWD/order.log"
EOF
}

test_expect_success 'post-command runs for a dashed external command' '
test_when_finished "rm -rf bin order.log .git/hooks/pre-command .git/hooks/post-command" &&
test_config postCommand.strategy always &&
write_order_hooks &&
mkdir bin &&
write_script bin/git-hello <<-\EOF &&
echo hello
EOF
PATH="$PWD/bin:$PATH" git hello &&
cat >expect <<-\EOF &&
pre git-hello
post git-hello
EOF
test_cmp expect order.log
'

test_expect_success 'post-command runs for a builtin that does not set up the repository' '
test_when_finished "rm -f order.log .git/hooks/pre-command .git/hooks/post-command" &&
test_config postCommand.strategy always &&
write_order_hooks &&
git version &&
cat >expect <<-\EOF &&
pre version
post version
EOF
test_cmp expect order.log
'

test_expect_success 'post-command runs when a dashed external vanishes before alias fallback' '
test_when_finished "rm -rf bin order.log .git/hooks/pre-command .git/hooks/post-command" &&
test_config postCommand.strategy always &&
test_config alias.vanish "rev-parse --git-dir" &&
write_order_hooks &&
mkdir bin &&
write_script bin/git-vanish <<-\EOF &&
echo vanish-script-ran
EOF
PATH="$PWD/bin:$PATH" git vanish >out &&
test_grep ! vanish-script-ran out &&
cat >expect <<-\EOF &&
pre git-vanish
post git-vanish
pre rev-parse
post rev-parse
EOF
test_cmp expect order.log
'

test_expect_success 'with post-index-change config' '
mkdir -p internal-hooks &&
write_script internal-hooks/post-command <<-EOF &&
Expand Down
Loading