99ddc24672
Fix a logic error ina082345372
(hook API: fix v2.36.0 regression: hooks should be connected to a TTY, 2022-06-07). When it started using the "ungroup" API added infd3aaf53f7
(run-command: add an "ungroup" option to run_process_parallel(), 2022-06-07) it should have made the same sort of change thatfd3aaf53f7
itself made in "t/helper/test-run-command.c". The correct way to emit this "Couldn't start" output with "ungroup" would be: fprintf(stderr, _("Couldn't start hook '%s'\n"), hook_path); But we should instead remove the emitting of this output. As the added test shows we already emit output when we can't run the child. The "cannot run" output here is emitted by run-command.c's child_err_spew(). So the addition of the "Couldn't start hook" output here in96e7225b31
(hook: add 'run' subcommand, 2021-12-22) was always redundant. For the pre-commit hook we'll now emit exactly the same output as we did beforef443246b9f
(commit: convert {pre-commit,prepare-commit-msg} hook to hook.h, 2021-12-22) (and likewise for others). We could at this point add this to the pick_next_hook() callbacks in hook.c: assert(!out); assert(!*pp_task_cb); And this to notify_start_failure() and notify_hook_finished() (in the latter case the parameter is called "pp_task_cp"): assert(!out); assert(!pp_task_cb); But let's leave any such instrumentation for some eventual cleanup of the "ungroup" API. Reported-by: Ilya K <me@0upti.me> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Reviewed-by: Emily Shaffer <emilyshaffer@google.com> Reviewed-by: Đoàn Trần Công Danh <congdanhqx@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
181 lines
4.3 KiB
Bash
Executable File
181 lines
4.3 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_expect_success 'git hook run a hook with a bad shebang' '
|
|
test_when_finished "rm -rf bad-hooks" &&
|
|
mkdir bad-hooks &&
|
|
write_script bad-hooks/test-hook "/bad/path/no/spaces" </dev/null &&
|
|
|
|
# TODO: We should emit the same (or at least a more similar)
|
|
# error on Windows and !Windows. See the OS-specific code in
|
|
# start_command()
|
|
if test_have_prereq !WINDOWS
|
|
then
|
|
cat >expect <<-\EOF
|
|
fatal: cannot run bad-hooks/test-hook: ...
|
|
EOF
|
|
else
|
|
cat >expect <<-\EOF
|
|
error: cannot spawn bad-hooks/test-hook: ...
|
|
EOF
|
|
fi &&
|
|
test_expect_code 1 git \
|
|
-c core.hooksPath=bad-hooks \
|
|
hook run test-hook >out 2>err &&
|
|
test_must_be_empty out &&
|
|
sed -e "s/test-hook: .*/test-hook: .../" <err >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_done
|