summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2021-05-21 14:36:49 +0000
committerKitware Robot <kwrobot@kitware.com>2021-05-21 10:36:56 -0400
commitfe9988add39e732cb8a725fe6f6bca72408ebcfd (patch)
tree597fb4ad47f6711a7296e230280ace92f29af58f
parentc23e2fa0c51ce1c7c4654da038e9d2cfcc944358 (diff)
parent8a9753e4279788ff30bd59c0a9f88392fa3cfd68 (diff)
downloadcmake-fe9988add39e732cb8a725fe6f6bca72408ebcfd.tar.gz
Merge topic 'git-config-version-check' into release-3.20
8a9753e427 ExternalProject: Only add git config setting with git 1.7.7 or later Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6145
-rw-r--r--Modules/ExternalProject.cmake8
1 files changed, 5 insertions, 3 deletions
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index 56525080cc..90ed1ee63b 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -2663,9 +2663,11 @@ function(_ep_add_download_command name)
get_property(git_progress TARGET ${name} PROPERTY _EP_GIT_PROGRESS)
get_property(git_config TARGET ${name} PROPERTY _EP_GIT_CONFIG)
- # Make checkouts quiet when checking out a git hash (this avoids the
- # very noisy detached head message)
- list(PREPEND git_config advice.detachedHead=false)
+ # If git supports it, make checkouts quiet when checking out a git hash.
+ # This avoids the very noisy detached head message.
+ if(GIT_VERSION_STRING VERSION_GREATER_EQUAL 1.7.7)
+ list(PREPEND git_config advice.detachedHead=false)
+ endif()
# For the download step, and the git clone operation, only the repository
# should be recorded in a configured RepositoryInfo file. If the repo