dilim/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-08-03 06:10:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

ExternalProject: omit --no-checkout from git clone when using git 2.20.x.

Browse Source 
The optimization from commit 627fc5b44f (ExternalProject: Avoid
unnecessary checkout on clone, 2019-07-29, v3.16.0-rc1~325^2) triggers a
bug in the Git 2.20.x series that is not in older or newer versions.
Drop the optimization for that specific range of Git versions.

Fixes: #21009
This commit is contained in:
Nate Avers
2020-07-23 22:25:22 -04:00
committed by Brad King
parent d421274e3e
commit 8dbefc3ca6
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Modules/ExternalProject.cmake
View File

@@ -1124,7 +1124,11 @@ function(_ep_write_gitclone_script script_filename source_dir git_EXECUTABLE git
message(FATAL_ERROR "Tag for git checkout should not be empty.") message(FATAL_ERROR "Tag for git checkout should not be empty.")
endif() endif()
set(git_clone_options "--no-checkout") if(GIT_VERSION_STRING VERSION_LESS 2.20 OR 2.21 VERSION_LESS_EQUAL GIT_VERSION_STRING)
set(git_clone_options "--no-checkout")
else()
set(git_clone_options)
endif()
if(git_shallow) if(git_shallow)
if(NOT GIT_VERSION_STRING VERSION_LESS 1.7.10) if(NOT GIT_VERSION_STRING VERSION_LESS 1.7.10)
list(APPEND git_clone_options "--depth 1 --no-single-branch") list(APPEND git_clone_options "--depth 1 --no-single-branch")