[Cmake-commits] CMake branch, next, updated. v2.8.4-1135-gca37b80

[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  ca37b807f30177828b88eeb948b89888ffa7de50 (commit)
       via  732af7fbba47d1f88fdaed6b9fac520e8e06313c (commit)
      from  1d799eab201c81822cf0a36aa07c1d862a2aa165 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ca37b807f30177828b88eeb948b89888ffa7de50
commit ca37b807f30177828b88eeb948b89888ffa7de50
Merge: 1d799ea 732af7f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Mar 10 14:00:16 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Mar 10 14:00:16 2011 -0500

    Merge topic 'ctest-git-submodule-recursive' into next
    
    732af7f CTest: Do not fail with submodules and Git < 1.6.5.0


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=732af7fbba47d1f88fdaed6b9fac520e8e06313c
commit 732af7fbba47d1f88fdaed6b9fac520e8e06313c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Mar 10 13:57:30 2011 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Mar 10 13:57:30 2011 -0500

    CTest: Do not fail with submodules and Git < 1.6.5.0
    
    Several major Linux distributions still do not provide Git >= 1.6.5.0 in
    their stable package lists.  Prior to commit 1173cc4a (Update Git
    submodules with --recursive, 2011-02-22) CTest was able to use older Git
    versions but simply silently failed to update submodules recursively.
    Instead of failing with older Git versions preserve the status quo and
    add a warning in the update log.  Users testing projects with recursive
    submodules may simply update to a Git new enough to support them.

diff --git a/Source/CTest/cmCTestGIT.cxx b/Source/CTest/cmCTestGIT.cxx
index 3f55f85..2c1a0af 100644
--- a/Source/CTest/cmCTestGIT.cxx
+++ b/Source/CTest/cmCTestGIT.cxx
@@ -281,8 +281,7 @@ bool cmCTestGIT::UpdateImpl()
     // No need to require >= 1.6.5.0 if there are no submodules.
     if(cmSystemTools::FileExists((top_dir + "/.gitmodules").c_str()))
       {
-      this->Log << "Git >= 1.6.5.0 required for submodule support\n";
-      return false;
+      this->Log << "Git < 1.6.5.0 cannot update submodules recursively\n";
       }
     }
 

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

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


hooks/post-receive
-- 
CMake