Skip to content

Restore previous errno after post command hook #860

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
dscho merged 1 commit into from
Feb 10, 2026
Merged

Restore previous errno after post command hook #860

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
3 changes: 3 additions & 0 deletions git.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,6 +504,7 @@ static int run_post_command_hook(struct repository *r)
{
char *lock;
int ret = 0;
int saved_errno = errno;
struct run_hooks_opt opt = RUN_HOOKS_OPT_INIT;

/*
Expand All @@ -520,6 +521,8 @@ static int run_post_command_hook(struct repository *r)
ret = run_hooks_opt(r, "post-command", &opt);

run_post_hook = 0;

errno = saved_errno;
strvec_clear(&sargv);
strvec_clear(&opt.args);
setenv("COMMAND_HOOK_LOCK", "false", 1);
Expand Down
15 changes: 15 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 @@ -4,6 +4,21 @@ test_description='post-command hook'

. ./test-lib.sh

test_expect_success 'hook does not block git help' '
git config help.autocorrect immediate &&
git commit --allow-empty -m "a single log entry" &&
mkdir -p .git/hooks &&
write_script .git/hooks/post-command <<-EOF &&
echo "\$*" | sed "s/ --git-pid=[0-9]*//" \
>\$(git rev-parse --git-dir)/post-command.out
EOF
# intentional typo "logg" gets autocorrected to "log"
git logg --format=%s --first-parent > actual &&
test "log --format=%s --first-parent --exit_code=0" = "$(cat .git/post-command.out)" &&
echo "a single log entry" >expect &&
test_cmp expect actual
'

test_expect_success 'with no hook' '
echo "first" > file &&
git add file &&
Expand Down