[Cmake-commits] CMake branch, next, updated. v3.5.1-695-gc971f75

[Ben Boeckel]

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  c971f751b482213ba817c4dcbffb5b2d96021120 (commit)
       via  07b7614e07e351ea46c32eebfc1195d6f5a18a10 (commit)
      from  46f442feed475ecaa2c43499f5bc0bbf00a60289 (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=c971f751b482213ba817c4dcbffb5b2d96021120
commit c971f751b482213ba817c4dcbffb5b2d96021120
Merge: 46f442f 07b7614
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Tue Mar 29 11:57:36 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Mar 29 11:57:36 2016 -0400

    Merge topic 'ctest-run-submodule-sync' into next
    
    07b7614e fixup! cmCTestGIT: run git submodule {init,sync} to update


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=07b7614e07e351ea46c32eebfc1195d6f5a18a10
commit 07b7614e07e351ea46c32eebfc1195d6f5a18a10
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Tue Mar 29 11:56:10 2016 -0400
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Tue Mar 29 11:56:10 2016 -0400

    fixup! cmCTestGIT: run git submodule {init,sync} to update

diff --git a/Source/CTest/cmCTestGIT.cxx b/Source/CTest/cmCTestGIT.cxx
index 4dd617f..ee462f8 100644
--- a/Source/CTest/cmCTestGIT.cxx
+++ b/Source/CTest/cmCTestGIT.cxx
@@ -273,15 +273,27 @@ bool cmCTestGIT::UpdateImpl()
   std::string top_dir = this->FindTopDir();
   const char* git = this->CommandLineTool.c_str();
   const char* recursive = "--recursive";
+  const char* sync_recursive = "--recursive";
+
+  // Git < 1.6.5 did not support submodule --recursive
+  if(this->GetGitVersion() < cmCTestGITVersion(1,6,5,0))
+    {
+    recursive = 0;
+    // No need to require >= 1.6.5 if there are no submodules.
+    if(cmSystemTools::FileExists((top_dir + "/.gitmodules").c_str()))
+      {
+      this->Log << "Git < 1.6.5 cannot update submodules recursively\n";
+      }
+    }
 
   // Git < 1.8.1 did not support sync --recursive
   if(this->GetGitVersion() < cmCTestGITVersion(1,8,1,0))
     {
-    recursive = 0;
+    sync_recursive = 0;
     // No need to require >= 1.8.1 if there are no submodules.
     if(cmSystemTools::FileExists((top_dir + "/.gitmodules").c_str()))
       {
-      this->Log << "Git < 1.8.1 cannot update submodules recursively\n";
+      this->Log << "Git < 1.8.1 cannot synchronize submodules recursively\n";
       }
     }
 
@@ -297,7 +309,8 @@ bool cmCTestGIT::UpdateImpl()
     return false;
     }
 
-  char const* git_submodule_sync[] = {git, "submodule", "sync", recursive, 0};
+  char const* git_submodule_sync[] = {git, "submodule", "sync",
+                                      sync_recursive, 0};
   ret = this->RunChild(git_submodule_sync, &submodule_out, &submodule_err,
                        top_dir.c_str());
 

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

Summary of changes:
 Source/CTest/cmCTestGIT.cxx |   19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake