Skip to content

Fix Git version detection when embedded #551

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
Sapd merged 2 commits into from
Jul 30, 2026
+32 −11
Merged

Fix Git version detection when embedded #551

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f0e2921
Fix Git version detection when embedded
ChrisLauinger77 Jul 30, 2026
8c6530c
Reject parent repository version metadata
ChrisLauinger77 Jul 30, 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
43 changes: 32 additions & 11 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,25 +86,46 @@ if(DEFINED HEADSETCONTROL_VERSION AND HEADSETCONTROL_VERSION)
set(GIT_VERSION "${HEADSETCONTROL_VERSION}")
else()
execute_process(
COMMAND git describe --tags --dirty=-modified
OUTPUT_VARIABLE GIT_VERSION
COMMAND git rev-parse --show-toplevel
WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
Comment thread
ChrisLauinger77 marked this conversation as resolved.
OUTPUT_VARIABLE GIT_TOP_LEVEL
OUTPUT_STRIP_TRAILING_WHITESPACE
ERROR_QUIET
RESULT_VARIABLE GIT_RESULT
)

# Fallback if git describe fails (no tags, shallow clone, etc.)
if(NOT GIT_VERSION OR NOT GIT_RESULT EQUAL 0)
get_filename_component(HEADSETCONTROL_SOURCE_DIR_REAL
"${PROJECT_SOURCE_DIR}" REALPATH)
get_filename_component(GIT_TOP_LEVEL_REAL "${GIT_TOP_LEVEL}" REALPATH)

# Do not derive the version from a parent repository when this source tree is
# vendored without its own Git metadata.
if(NOT GIT_RESULT EQUAL 0
OR NOT GIT_TOP_LEVEL_REAL STREQUAL HEADSETCONTROL_SOURCE_DIR_REAL)
set(GIT_VERSION "0.0.0-unknown")
else()
execute_process(
COMMAND git rev-parse --short HEAD
OUTPUT_VARIABLE GIT_HASH
COMMAND git describe --tags --dirty=-modified
WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
OUTPUT_VARIABLE GIT_VERSION
OUTPUT_STRIP_TRAILING_WHITESPACE
ERROR_QUIET
RESULT_VARIABLE GIT_RESULT
)
if(GIT_HASH)
set(GIT_VERSION "0.0.0-${GIT_HASH}")
else()
set(GIT_VERSION "0.0.0-unknown")

# Fallback if git describe fails (no tags, shallow clone, etc.)
if(NOT GIT_VERSION OR NOT GIT_RESULT EQUAL 0)
execute_process(
COMMAND git rev-parse --short HEAD
WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
OUTPUT_VARIABLE GIT_HASH
OUTPUT_STRIP_TRAILING_WHITESPACE
ERROR_QUIET
)
if(GIT_HASH)
set(GIT_VERSION "0.0.0-${GIT_HASH}")
else()
set(GIT_VERSION "0.0.0-unknown")
endif()
endif()
endif()
endif()
Expand Down
Loading