This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 20e7a6dcda2c9e214b8998a7124c3ac2f6471507 (commit)
via 6f3838c034e652b90d9c2571851729313880a328 (commit)
from c791fb12544926bc5870a61735dc2ec62940a6f6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=20e7a6dcda2c9e214b8998a7124c3ac2f6471507
commit 20e7a6dcda2c9e214b8998a7124c3ac2f6471507
Merge: c791fb1 6f3838c
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Mar 31 17:01:44 2017 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Fri Mar 31 13:01:52 2017 -0400
Stage topic 'ExternalProject-fix-remote-branch'
Topic-id: 23427
Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/649
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6f3838c034e652b90d9c2571851729313880a328
commit 6f3838c034e652b90d9c2571851729313880a328
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Mar 31 12:53:51 2017 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Fri Mar 31 12:59:53 2017 -0400
ExternalProject: Fix regression in GIT_TAG with remote branch name
The change in commit v3.8.0-rc2~7^2 (ExternalProject: Run `git
checkout` with `--` to clarify arguments, 2017-02-24) broke the case of
`GIT_TAG some-remote-branch` because an explicit `--` means that the
preceding argument is a tree-ish instead of a branch. Revert the change
and leave a comment.
Fixes: #16763
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index 00781d6..b42d2dd 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -600,8 +600,11 @@ 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}
WORKING_DIRECTORY \"${work_dir}/${src_name}\"
RESULT_VARIABLE error_code
)
-----------------------------------------------------------------------
Summary of changes:
Modules/ExternalProject.cmake | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
