Fix proxy-verifier storage for git worktrees - #12686
Merged
Merged
Conversation
PR apache#12664 changed proxy-verifier storage to be in ${CMAKE_SOURCE_DIR}/.git. Sadly, this fails in git worktrees where .git is a file pointing to the actual git directory. Use git rev-parse --git-common-dir to dynamically detect the correct git directory, which works for both regular repositories and worktrees. This ensures proxy-verifier binaries are stored in a shared location accessible to all worktrees.
ezelkow1
approved these changes
Nov 21, 2025
bneradt
added a commit
to bneradt/trafficserver
that referenced
this pull request
Nov 24, 2025
The git rev-parse --git-common-dir command added in apache#12686 returns an absolute path to the relevant .git direcotry for worktrees. Unfortunately, it does a relative path for "regular" non-worktree clones. Without converting to an absolute path, PROXY_VERIFIER_PATH becomes relative and fails to resolve correctly when passed to autest. This adds get_filename_component to ensure GIT_COMMON_DIR is always absolute, fixing the issue for both repository types.
bneradt
added a commit
that referenced
this pull request
Nov 24, 2025
The git rev-parse --git-common-dir command added in #12686 returns an absolute path to the relevant .git direcotry for worktrees. Unfortunately, it does a relative path for "regular" non-worktree clones. Without converting to an absolute path, PROXY_VERIFIER_PATH becomes relative and fails to resolve correctly when passed to autest. This adds get_filename_component to ensure GIT_COMMON_DIR is always absolute, fixing the issue for both repository types.
Contributor
|
Cherry-picked to 10.1.x branch |
cmcfarlen
pushed a commit
that referenced
this pull request
Dec 2, 2025
PR #12664 changed proxy-verifier storage to be in ${CMAKE_SOURCE_DIR}/.git. Sadly, this fails in git worktrees where .git is a file pointing to the actual git directory. Use git rev-parse --git-common-dir to dynamically detect the correct git directory, which works for both regular repositories and worktrees. This ensures proxy-verifier binaries are stored in a shared location accessible to all worktrees. (cherry picked from commit 1fc5b47)
cmcfarlen
pushed a commit
that referenced
this pull request
Dec 2, 2025
The git rev-parse --git-common-dir command added in #12686 returns an absolute path to the relevant .git direcotry for worktrees. Unfortunately, it does a relative path for "regular" non-worktree clones. Without converting to an absolute path, PROXY_VERIFIER_PATH becomes relative and fails to resolve correctly when passed to autest. This adds get_filename_component to ensure GIT_COMMON_DIR is always absolute, fixing the issue for both repository types. (cherry picked from commit e699cbe)
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
3 participants
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.
PR #12664 changed proxy-verifier storage to be in
${CMAKE_SOURCE_DIR}/.git. Sadly, this fails in git worktrees where .git is a file pointing to the actual git directory. Use git rev-parse --git-common-dir to dynamically detect the correct git directory, which works for both regular repositories and worktrees. This ensures proxy-verifier binaries are stored in a shared location accessible to all worktrees.