[Cmake-commits] CMake branch, next, updated. v2.8.8-3268-g8d1bb7c

[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  8d1bb7cf2d6c0505e9827f4da18f5dc754cb6054 (commit)
       via  5c153c62f3780bdc4976a9d25e6b0c217170558e (commit)
       via  30305b989e944d0b5bdff16ba408d636a8c81e91 (commit)
      from  5a7ae88566f14ea2253c4bcfec57044f45404392 (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=8d1bb7cf2d6c0505e9827f4da18f5dc754cb6054
commit 8d1bb7cf2d6c0505e9827f4da18f5dc754cb6054
Merge: 5a7ae88 5c153c6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jun 20 10:20:11 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jun 20 10:20:11 2012 -0400

    Merge topic 'CTestUpdateGit-safecrlf' into next
    
    5c153c6 Make CTest.UpdateGIT robust to Git safecrlf on Windows
    30305b9 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5c153c62f3780bdc4976a9d25e6b0c217170558e
commit 5c153c62f3780bdc4976a9d25e6b0c217170558e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jun 20 10:14:23 2012 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jun 20 10:19:44 2012 -0400

    Make CTest.UpdateGIT robust to Git safecrlf on Windows
    
    If the user has configured 'core.autocrlf' and 'core.safecrlf' then
    'git submodule add' will fail to 'git add' the '.gitmodules' file because
    it has LF newlines, at least as of Git 1.7.11.  Disable 'core.safecrlf'
    in our test repository to avoid the problem.

diff --git a/Tests/CTestUpdateGIT.cmake.in b/Tests/CTestUpdateGIT.cmake.in
index 793b987..eb9f987 100644
--- a/Tests/CTestUpdateGIT.cmake.in
+++ b/Tests/CTestUpdateGIT.cmake.in
@@ -91,6 +91,9 @@ run_child(WORKING_DIRECTORY ${TOP}/import
   COMMAND ${GIT} add .
   )
 run_child(WORKING_DIRECTORY ${TOP}/import
+  COMMAND ${GIT} config core.safecrlf false
+  )
+run_child(WORKING_DIRECTORY ${TOP}/import
   COMMAND ${GIT} submodule add ${MOD_REPO} module
   )
 run_child(WORKING_DIRECTORY ${TOP}/import

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

Summary of changes:
 Source/CMakeVersion.cmake     |    2 +-
 Tests/CTestUpdateGIT.cmake.in |    3 +++
 2 files changed, 4 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake