From 7bf15e49a848b2ff0afe2697027935e7bc9e4992 Mon Sep 17 00:00:00 2001 From: Craig Scott Date: Tue, 14 May 2024 20:58:51 +1000 Subject: ExternalProject: Fix misleading git update output When re-running the build with the git download method, and where GIT_TAG is set to a tag name that we already have locally from the first run, the second run will skip the update step if it is already at the requested tag. The message in this case was previously printing the commit hash instead of the tag name, which was wrong. This wasn't noticed before because that output wasn't usually shown, but we now do show that message after making message output log levels more consistent between the steps. --- Modules/ExternalProject/gitupdate.cmake.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/ExternalProject/gitupdate.cmake.in b/Modules/ExternalProject/gitupdate.cmake.in index a56fb67..4e3fba6 100644 --- a/Modules/ExternalProject/gitupdate.cmake.in +++ b/Modules/ExternalProject/gitupdate.cmake.in @@ -70,7 +70,7 @@ elseif(show_ref_output MATCHES "^[a-z0-9]+[ \\t]+refs/tags/") # FIXME: We should provide an option to always fetch for this case get_hash_for_ref("@git_tag@" tag_sha error_msg) if(tag_sha STREQUAL head_sha) - message(VERBOSE "Already at requested tag: ${tag_sha}") + message(VERBOSE "Already at requested tag: @git_tag@") return() endif() -- cgit v0.12