summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-04-04 13:27:51 (GMT)
committerKitware Robot <kwrobot@kitware.com>2017-04-04 13:27:54 (GMT)
commit1180fdb6565dcc5f94930a399feed803e7871e46 (patch)
tree3d2ef13206e4330f2ca6b2424d6266aecd3e4e90
parent348519cce59928b1aa09a540d3becffa7dd75947 (diff)
parent12a781301c41f187b8d91ffd4461820c42bdaf5a (diff)
downloadCMake-1180fdb6565dcc5f94930a399feed803e7871e46.zip
CMake-1180fdb6565dcc5f94930a399feed803e7871e46.tar.gz
CMake-1180fdb6565dcc5f94930a399feed803e7871e46.tar.bz2
Merge topic 'ExternalProject-checkout-clarify'
12a78130 ExternalProject: Run `git checkout` with `--` to clarify arguments Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !660
-rw-r--r--Modules/ExternalProject.cmake14
1 files changed, 10 insertions, 4 deletions
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index 34dc98c..b812845 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -531,6 +531,15 @@ function(_ep_write_gitclone_script script_filename source_dir git_EXECUTABLE git
else()
set(git_clone_shallow_options "--depth 1")
endif()
+ if(NOT GIT_VERSION_STRING VERSION_LESS 1.8.5)
+ # Use `git checkout <tree-ish> --` to avoid ambiguity with a local path.
+ set(git_checkout_explicit-- "--")
+ else()
+ # Use `git checkout <branch>` even though this risks ambiguity with a
+ # local path. Unfortunately we cannot use `git checkout <tree-ish> --`
+ # because that will not search for remote branch names, a common use case.
+ set(git_checkout_explicit-- "")
+ endif()
file(WRITE ${script_filename}
"if(\"${git_tag}\" STREQUAL \"\")
message(FATAL_ERROR \"Tag for git checkout should not be empty.\")
@@ -600,11 +609,8 @@ if(error_code)
message(FATAL_ERROR \"Failed to clone repository: '${git_repository}'\")
endif()
-# Use `git checkout <branch>` even though this risks ambiguity with a
-# local path. Unfortunately we cannot use `git checkout <tree-ish> --`
-# because that will not search for remote branch names, a common use case.
execute_process(
- COMMAND \"${git_EXECUTABLE}\" \${git_options} checkout ${git_tag}
+ COMMAND \"${git_EXECUTABLE}\" \${git_options} checkout ${git_tag} ${git_checkout_explicit--}
WORKING_DIRECTORY \"${work_dir}/${src_name}\"
RESULT_VARIABLE error_code
)