[PATCH 3/3] t9164: fix inability to find basename(1) in hooks
- From
Patrick Steinhardt <ps@pks.im>
- Date
- Nov 8, 2023, 07:30 UTC
- Message-ID
- <b50e625f9677469ecb33150343b88d5ac119dadd.1699428122.git.ps@pks.im>
- In-Reply-To
- <cover.1699428122.git.ps@pks.im>
The post-commit hook in t9164 is executed with a default environment. To work around this issue we already write the current `PATH` value into the hook script. But this is done at a point where we already tried to execute non-built-in commands, namely basename(1). While this seems to work alright on most platforms, it fails on NixOS.
Set the `PATH` variable earlier to fix this issue. Note that we do this via two separate heredocs. This is done because in the first one we do want to expand variables, whereas in the second one we don't.
Signed-off-by: Patrick Steinhardt <ps@pks.im> --- t/t9164-git-svn-dcommit-concurrent.sh | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/t/t9164-git-svn-dcommit-concurrent.sh b/t/t9164-git-svn-dcommit-concurrent.sh index c8e6c0733f4..3b64022dc57 100755 --- a/t/t9164-git-svn-dcommit-concurrent.sh +++ b/t/t9164-git-svn-dcommit-concurrent.sh @@ -47,9 +47,15 @@ setup_hook() echo "cnt=$skip_revs" > "$hook_type-counter" rm -f "$rawsvnrepo/hooks/"*-commit # drop previous hooks hook="$rawsvnrepo/hooks/$hook_type" - cat > "$hook" <<- 'EOF1' + cat >"$hook" <<-EOF #!/bin/sh set -e + + PATH=\"$PATH\" + export PATH + EOF + + cat >>"$hook" <<-'EOF' cd "$1/.." # "$1" is repository location exec >> svn-hook.log 2>&1 hook="$(basename "$0")" @@ -59,11 +65,11 @@ setup_hook() cnt="$(($cnt - 1))" echo "cnt=$cnt" > ./$hook-counter [ "$cnt" = "0" ] || exit 0 -EOF1 + EOF + if [ "$hook_type" = "pre-commit" ]; then echo "echo 'commit disallowed' >&2; exit 1" >>"$hook" else - echo "PATH=\"$PATH\"; export PATH" >>"$hook" echo "svnconf=\"$svnconf\"" >>"$hook" cat >>"$hook" <<- 'EOF2' cd work-auto-commits.svn
-- 2.42.0