Skip to content

build: fix resolve cache path in worktrees and submodules #11501

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
kgryte merged 3 commits into from
Apr 17, 2026
Merged

build: fix resolve cache path in worktrees and submodules #11501

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
52eac40
fix(git-hooks): resolve hooks-cache path in worktrees and submodules
batpigandme Apr 17, 2026
e147d1d
fix: remove unused `root` variable from `commit-msg` hook
batpigandme Apr 17, 2026
89216b3
Apply suggestions from code review
kgryte Apr 17, 2026
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
6 changes: 3 additions & 3 deletions tools/git/hooks/commit-msg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ skip_lint="${SKIP_LINT_COMMIT}"
# Get the path to a file containing the commit message:
commit_message="$1"

# Determine root directory:
root=$(git rev-parse --show-toplevel)
# Determine git directory (resolves where `${root}/.git` is file OR directory):
Comment thread
kgryte marked this conversation as resolved.
Outdated
git_dir=$(git rev-parse --absolute-git-dir)

# Define the path to a report generated during the pre-commit hook:
pre_commit_report="${root}/.git/hooks-cache/pre_commit_report.yml"
pre_commit_report="${git_dir}/hooks-cache/pre_commit_report.yml"


# FUNCTIONS #
Expand Down
5 changes: 4 additions & 1 deletion tools/git/hooks/pre-commit
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@ skip_editorconfig="${SKIP_LINT_EDITORCONFIG}"
# Determine root directory:
root=$(git rev-parse --show-toplevel)

# Determine git directory (resolves where `${root}/.git` is file OR directory):
Comment thread
kgryte marked this conversation as resolved.
Outdated
git_dir=$(git rev-parse --absolute-git-dir)

# Define the path to a utility for linting filenames:
lint_filenames="${root}/lib/node_modules/@stdlib/_tools/lint/filenames/bin/cli"

Expand Down Expand Up @@ -81,7 +84,7 @@ cppcheck_tests_fixtures_suppressions_list="${root}/etc/cppcheck/suppressions.tes
cppcheck_benchmarks_suppressions_list="${root}/etc/cppcheck/suppressions.benchmarks.txt"

# Define the path to a directory for caching hook results:
cache_dir="${root}/.git/hooks-cache"
cache_dir="${git_dir}/hooks-cache"

# Define the path to a file for storing hook results:
cache_file="${cache_dir}/pre_commit_report.yml"
Expand Down
5 changes: 4 additions & 1 deletion tools/git/hooks/pre-push
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,11 @@ GIT_CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
# Determine root directory:
root=$(git rev-parse --show-toplevel)

# Determine git directory (resolves where `${root}/.git` is file OR directory):
Comment thread
kgryte marked this conversation as resolved.
Outdated
git_dir=$(git rev-parse --absolute-git-dir)

# Define the path to a directory for caching hook results:
cache_dir="${root}/.git/hooks-cache"
cache_dir="${git_dir}/hooks-cache"

# Define the path to a file for storing hook results:
cache_file="${cache_dir}/pre_push_report.yml"
Expand Down