Merge branch 'bugfix/support_worktree_on_cmake' into 'master'

cmake: support git worktree

See merge request espressif/esp-idf!6581

tools/ci/test_build_system_cmake.sh

@@ -580,6 +580,14 @@ endmenu\n" >> ${IDF_PATH}/Kconfig
     rm sdkconfig.defaults1
     rm sdkconfig.defaults2
 
+    print_status "Supports git worktree"
+    clean_build_dir
+    git branch test_build_system
+    git worktree add ../esp-idf-template-test test_build_system
+    diff <(idf.py reconfigure | grep "Project version") <(cd ../esp-idf-template-test && idf.py reconfigure | grep "Project version") \
+        || failure "Version on worktree should have been properly resolved"
+    git worktree remove ../esp-idf-template-test
+
     print_status "All tests completed"
     if [ -n "${FAILURES}" ]; then
         echo "Some failures were detected:"

tools/cmake/third_party/GetGitRevisionDescription.cmake

@@ -43,26 +43,25 @@ set(__get_git_revision_description YES)
 get_filename_component(_gitdescmoddir ${CMAKE_CURRENT_LIST_FILE} PATH)
 
 function(get_git_head_revision _refspecvar _hashvar _repo_dir)
-    set(GIT_PARENT_DIR "${_repo_dir}")
-	set(GIT_DIR "${GIT_PARENT_DIR}/.git")
-	while(NOT EXISTS "${GIT_DIR}")	# .git dir not found, search parent directories
-		set(GIT_PREVIOUS_PARENT "${GIT_PARENT_DIR}")
-		get_filename_component(GIT_PARENT_DIR ${GIT_PARENT_DIR} PATH)
-		if(GIT_PARENT_DIR STREQUAL GIT_PREVIOUS_PARENT)
-			# We have reached the root directory, we are not in git
-			set(${_refspecvar} "GITDIR-NOTFOUND" PARENT_SCOPE)
-			set(${_hashvar} "GITDIR-NOTFOUND" PARENT_SCOPE)
+    execute_process(COMMAND
+        "${GIT_EXECUTABLE}"
+        rev-parse
+        --git-dir
+        WORKING_DIRECTORY
+        ${_repo_dir}
+        RESULT_VARIABLE
+        res
+        OUTPUT_VARIABLE
+        GIT_DIR
+        ERROR_QUIET
+        OUTPUT_STRIP_TRAILING_WHITESPACE)
+        
+    if(NOT res EQUAL 0)
         return()
     endif()
-		set(GIT_DIR "${GIT_PARENT_DIR}/.git")
-	endwhile()
-	# check if this is a submodule
-	if(NOT IS_DIRECTORY ${GIT_DIR})
-		file(READ ${GIT_DIR} submodule)
-		string(REGEX REPLACE "gitdir: (.*)\n$" "\\1" GIT_DIR_RELATIVE ${submodule})
-		get_filename_component(SUBMODULE_DIR ${GIT_DIR} PATH)
-		get_filename_component(GIT_DIR ${SUBMODULE_DIR}/${GIT_DIR_RELATIVE} ABSOLUTE)
-	endif()
+
+    get_filename_component(GIT_DIR "${GIT_DIR}" ABSOLUTE BASE_DIR "${_repo_dir}")
+
     set(GIT_DATA "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/git-data")
     if(NOT EXISTS "${GIT_DATA}")
         file(MAKE_DIRECTORY "${GIT_DATA}")
@@ -71,6 +70,7 @@ function(get_git_head_revision _refspecvar _hashvar _repo_dir)
     if(NOT EXISTS "${GIT_DIR}/HEAD")
         return()
     endif()
+
     set(HEAD_FILE "${GIT_DATA}/HEAD")
     configure_file("${GIT_DIR}/HEAD" "${HEAD_FILE}" COPYONLY)
 
@@ -95,6 +95,7 @@ function(git_describe _var _repo_dir)
     if(NOT hash)
         set(${_var} "HEAD-HASH-NOTFOUND" PARENT_SCOPE)
         return()
+        
     endif()
 
     # TODO sanitize