a082345372
Fix a regression reported[1] againstf443246b9f(commit: convert {pre-commit,prepare-commit-msg} hook to hook.h, 2021-12-22): Due to using the run_process_parallel() API in the earlier96e7225b31(hook: add 'run' subcommand, 2021-12-22) we'd capture the hook's stderr and stdout, and thus lose the connection to the TTY in the case of e.g. the "pre-commit" hook. As a preceding commit notes GNU parallel's similar --ungroup option also has it emit output faster. While we're unlikely to have hooks that emit truly massive amounts of output (or where the performance thereof matters) it's still informative to measure the overhead. In a similar "seq" test we're now ~30% faster: $ cat .git/hooks/seq-hook; git hyperfine -L rev origin/master,HEAD~0 -s 'make CFLAGS=-O3' './git hook run seq-hook' #!/bin/sh seq 100000000 Benchmark 1: ./git hook run seq-hook' in 'origin/master Time (mean ± σ): 787.1 ms ± 13.6 ms [User: 701.6 ms, System: 534.4 ms] Range (min … max): 773.2 ms … 806.3 ms 10 runs Benchmark 2: ./git hook run seq-hook' in 'HEAD~0 Time (mean ± σ): 603.4 ms ± 1.6 ms [User: 573.1 ms, System: 30.3 ms] Range (min … max): 601.0 ms … 606.2 ms 10 runs Summary './git hook run seq-hook' in 'HEAD~0' ran 1.30 ± 0.02 times faster than './git hook run seq-hook' in 'origin/master' 1. https://lore.kernel.org/git/CA+dzEBn108QoMA28f0nC8K21XT+Afua0V2Qv8XkR8rAeqUCCZw@mail.gmail.com/ Reported-by: Anthony Sottile <asottile@umich.edu> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> [jc: minor fix-up to tests for consistency] Signed-off-by: Junio C Hamano <gitster@pobox.com>
155 lines
3.5 KiB
Bash
Executable File
155 lines
3.5 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='git-hook command'
|
|
|
|
TEST_PASSES_SANITIZE_LEAK=true
|
|
. ./test-lib.sh
|
|
. "$TEST_DIRECTORY"/lib-terminal.sh
|
|
|
|
test_expect_success 'git hook usage' '
|
|
test_expect_code 129 git hook &&
|
|
test_expect_code 129 git hook run &&
|
|
test_expect_code 129 git hook run -h &&
|
|
test_expect_code 129 git hook run --unknown 2>err &&
|
|
grep "unknown option" err
|
|
'
|
|
|
|
test_expect_success 'git hook run: nonexistent hook' '
|
|
cat >stderr.expect <<-\EOF &&
|
|
error: cannot find a hook named test-hook
|
|
EOF
|
|
test_expect_code 1 git hook run test-hook 2>stderr.actual &&
|
|
test_cmp stderr.expect stderr.actual
|
|
'
|
|
|
|
test_expect_success 'git hook run: nonexistent hook with --ignore-missing' '
|
|
git hook run --ignore-missing does-not-exist 2>stderr.actual &&
|
|
test_must_be_empty stderr.actual
|
|
'
|
|
|
|
test_expect_success 'git hook run: basic' '
|
|
test_hook test-hook <<-EOF &&
|
|
echo Test hook
|
|
EOF
|
|
|
|
cat >expect <<-\EOF &&
|
|
Test hook
|
|
EOF
|
|
git hook run test-hook 2>actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'git hook run: stdout and stderr both write to our stderr' '
|
|
test_hook test-hook <<-EOF &&
|
|
echo >&1 Will end up on stderr
|
|
echo >&2 Will end up on stderr
|
|
EOF
|
|
|
|
cat >stderr.expect <<-\EOF &&
|
|
Will end up on stderr
|
|
Will end up on stderr
|
|
EOF
|
|
git hook run test-hook >stdout.actual 2>stderr.actual &&
|
|
test_cmp stderr.expect stderr.actual &&
|
|
test_must_be_empty stdout.actual
|
|
'
|
|
|
|
for code in 1 2 128 129
|
|
do
|
|
test_expect_success "git hook run: exit code $code is passed along" '
|
|
test_hook test-hook <<-EOF &&
|
|
exit $code
|
|
EOF
|
|
|
|
test_expect_code $code git hook run test-hook
|
|
'
|
|
done
|
|
|
|
test_expect_success 'git hook run arg u ments without -- is not allowed' '
|
|
test_expect_code 129 git hook run test-hook arg u ments
|
|
'
|
|
|
|
test_expect_success 'git hook run -- pass arguments' '
|
|
test_hook test-hook <<-\EOF &&
|
|
echo $1
|
|
echo $2
|
|
EOF
|
|
|
|
cat >expect <<-EOF &&
|
|
arg
|
|
u ments
|
|
EOF
|
|
|
|
git hook run test-hook -- arg "u ments" 2>actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'git hook run -- out-of-repo runs excluded' '
|
|
test_hook test-hook <<-EOF &&
|
|
echo Test hook
|
|
EOF
|
|
|
|
nongit test_must_fail git hook run test-hook
|
|
'
|
|
|
|
test_expect_success 'git -c core.hooksPath=<PATH> hook run' '
|
|
mkdir my-hooks &&
|
|
write_script my-hooks/test-hook <<-\EOF &&
|
|
echo Hook ran $1 >>actual
|
|
EOF
|
|
|
|
cat >expect <<-\EOF &&
|
|
Test hook
|
|
Hook ran one
|
|
Hook ran two
|
|
Hook ran three
|
|
Hook ran four
|
|
EOF
|
|
|
|
test_hook test-hook <<-EOF &&
|
|
echo Test hook
|
|
EOF
|
|
|
|
# Test various ways of specifying the path. See also
|
|
# t1350-config-hooks-path.sh
|
|
>actual &&
|
|
git hook run test-hook -- ignored 2>>actual &&
|
|
git -c core.hooksPath=my-hooks hook run test-hook -- one 2>>actual &&
|
|
git -c core.hooksPath=my-hooks/ hook run test-hook -- two 2>>actual &&
|
|
git -c core.hooksPath="$PWD/my-hooks" hook run test-hook -- three 2>>actual &&
|
|
git -c core.hooksPath="$PWD/my-hooks/" hook run test-hook -- four 2>>actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_hook_tty () {
|
|
cat >expect <<-\EOF
|
|
STDOUT TTY
|
|
STDERR TTY
|
|
EOF
|
|
|
|
test_when_finished "rm -rf repo" &&
|
|
git init repo &&
|
|
|
|
test_commit -C repo A &&
|
|
test_commit -C repo B &&
|
|
git -C repo reset --soft HEAD^ &&
|
|
|
|
test_hook -C repo pre-commit <<-EOF &&
|
|
test -t 1 && echo STDOUT TTY >>actual || echo STDOUT NO TTY >>actual &&
|
|
test -t 2 && echo STDERR TTY >>actual || echo STDERR NO TTY >>actual
|
|
EOF
|
|
|
|
test_terminal git -C repo "$@" &&
|
|
test_cmp expect repo/actual
|
|
}
|
|
|
|
test_expect_success TTY 'git hook run: stdout and stderr are connected to a TTY' '
|
|
test_hook_tty hook run pre-commit
|
|
'
|
|
|
|
test_expect_success TTY 'git commit: stdout and stderr are connected to a TTY' '
|
|
test_hook_tty commit -m"B.new"
|
|
'
|
|
|
|
test_done
|