Merge pull request rpavlik#55 from malicious/worktree-support

Add support for git-worktree when finding GIT_DIR
kheaactua · Dec 10, 2019 · 8d8b489 · 8d8b489
2 parents 74bb568 + e22a3e6
commit 8d8b489
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/GetGitRevisionDescription.cmake b/GetGitRevisionDescription.cmake
@@ -66,6 +66,10 @@ function(get_git_head_revision _refspecvar _hashvar)
 		get_filename_component(SUBMODULE_DIR ${GIT_DIR} PATH)
 		get_filename_component(GIT_DIR ${SUBMODULE_DIR}/${GIT_DIR_RELATIVE} ABSOLUTE)
 	endif()
+	if(NOT IS_DIRECTORY "${GIT_DIR}")
+		file(READ ${GIT_DIR} worktree)
+ 		string(REGEX REPLACE "gitdir: (.*)worktrees(.*)\n$" "\\1" GIT_DIR ${worktree})
+ 	endif()
 	set(GIT_DATA "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/git-data")
 	if(NOT EXISTS "${GIT_DATA}")
 		file(MAKE_DIRECTORY "${GIT_DATA}")