Fix git hooks in worktrees#4859
Open
alexh-tigera wants to merge 2 commits into
Open
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
Enables git hooks and make pre-commit to function correctly when the operator repo is checked out as a git worktree (where .git is a file pointing elsewhere rather than a directory).
Changes:
install-git-hooksnow usesgit rev-parse --git-common-dirto locate the hooks directory and creates it if missing, supporting both regular and worktree checkouts.MakefilecomputesGIT_COMMON_DIRfromgit rev-parse --git-common-dir, mounts it into the container when it lives outsideCURDIR/.git, and uses it to readobjects/info/alternates.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
install-git-hooks |
Install hooks into the common git dir (handles worktrees) and create the hooks dir if absent. |
Makefile |
Add GIT_COMMON_DIR + WORKTREE_GIT_MOUNT and use them in the pre-commit target so the containerized hook can access git metadata in worktrees. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
electricjesus
approved these changes
May 26, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Allow git hooks to work when the operator repo is a worktree.
Release Note
For PR author
[ ] Tests for change.[ ] If changing pkg/apis/, runmake gen-files[ ] If changing versions, runmake gen-versionsFor PR reviewers
A note for code reviewers - all pull requests must have the following:
kind/bugif this is a bugfix.kind/enhancementif this is a a new feature.enterpriseif this PR applies to Calico Enterprise only.