Skip to content

Fix proxy-verifier path for non-worktree repositories - #12699

Merged
bneradt merged 1 commit into
apache:masterfrom
bneradt:fix_pv_get_non_worktree
Nov 24, 2025
Merged

bneradt merged 1 commit into
apache:masterfrom
bneradt:fix_pv_get_non_worktree

Conversation

@bneradt

@bneradt bneradt commented Nov 24, 2025

Copy link
Copy Markdown
Contributor

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.

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 bneradt added this to the 10.2.0 milestone Nov 24, 2025
@bneradt bneradt self-assigned this Nov 24, 2025
@bneradt bneradt added Bug AuTest CMake work related to CMakes scripts or issues labels Nov 24, 2025
bneradt added a commit that referenced this pull request Nov 24, 2025
This reverts commit ab0a575.

We have to circle back around on these. It turns out that CI was not running the autests due to needing #12699.
@bneradt
bneradt merged commit e699cbe into apache:master Nov 24, 2025
15 checks passed
@bneradt
bneradt deleted the fix_pv_get_non_worktree branch November 24, 2025 18:51
@github-project-automation github-project-automation Bot moved this to For v10.1.1 in ATS v10.1.x Dec 2, 2025
@cmcfarlen cmcfarlen moved this from For v10.1.1 to Picked v10.1.1 in ATS v10.1.x Dec 2, 2025
@cmcfarlen cmcfarlen modified the milestones: 10.2.0, 10.1.1 Dec 2, 2025
@cmcfarlen

Copy link
Copy Markdown
Contributor

Cherry-picked to 10.1.x branch

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)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

AuTest Bug CMake work related to CMakes scripts or issues

Projects

Status: Picked v10.1.1

Development

Successfully merging this pull request may close these issues.

3 participants