[Cmake-commits] CMake branch, next, updated. v3.5.2-1518-g093627b

[Brad King]

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  093627b6d828009e26d2108f69faf56670340930 (commit)
       via  2bc981e669087a489dec9ee4a62b447c3743bb79 (commit)
      from  2033a966ff73e6e7a6d0a4d52555d565e6a1b88f (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=093627b6d828009e26d2108f69faf56670340930
commit 093627b6d828009e26d2108f69faf56670340930
Merge: 2033a96 2bc981e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon May 23 09:46:16 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon May 23 09:46:16 2016 -0400

    Merge topic 'ExternalProject-fix-stash-all' into next
    
    2bc981e6 ExternalProject: Fix git stash not using "--all" option


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2bc981e669087a489dec9ee4a62b447c3743bb79
commit 2bc981e669087a489dec9ee4a62b447c3743bb79
Author:     Christian Fetzer <fetzer.ch at gmail.com>
AuthorDate: Sat May 21 11:34:04 2016 +0200
Commit:     Christian Fetzer <fetzer.ch at gmail.com>
CommitDate: Sat May 21 11:41:34 2016 +0200

    ExternalProject: Fix git stash not using "--all" option
    
    GIT_VERSION_STRING is unset in _ep_write_gitupdate_script(), hence
    git stash is not being called with the "--all" option, even if Git
    is new enough to support this.

diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index ad6de18..2ff18fc 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -2021,6 +2021,8 @@ function(_ep_add_update_command name)
       --non-interactive ${svn_trust_cert_args} ${svn_user_pw_args})
     set(always 1)
   elseif(git_repository)
+    unset(CMAKE_MODULE_PATH) # Use CMake builtin find module
+    find_package(Git QUIET)
     if(NOT GIT_EXECUTABLE)
       message(FATAL_ERROR "error: could not find git for fetch of ${name}")
     endif()

-----------------------------------------------------------------------

Summary of changes:
 Modules/ExternalProject.cmake |    2 ++
 1 file changed, 2 insertions(+)


hooks/post-receive
-- 
CMake