[Cmake-commits] CMake branch, next, updated. v3.1.0-rc3-1198-gea807b0

[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  ea807b0f7db7e6b7115e97bb9361d5de070798e1 (commit)
       via  2a3e263173e10de4a067a9de61318f6d6e0f0f17 (commit)
       via  f30bac5eb47b06d90be57d9aa8f176eeba1c9152 (commit)
      from  708c33bbcc11707f9ac80829aff2556ca750d089 (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=ea807b0f7db7e6b7115e97bb9361d5de070798e1
commit ea807b0f7db7e6b7115e97bb9361d5de070798e1
Merge: 708c33b 2a3e263
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Dec 16 14:51:36 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Dec 16 14:51:36 2014 -0500

    Merge topic 'test-CheckSourceTree-update' into next
    
    2a3e2631 Tests: Fix CheckSourceTree test for newer Git
    f30bac5e CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2a3e263173e10de4a067a9de61318f6d6e0f0f17
commit 2a3e263173e10de4a067a9de61318f6d6e0f0f17
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Dec 16 14:51:06 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Dec 16 14:51:06 2014 -0500

    Tests: Fix CheckSourceTree test for newer Git
    
    The output of 'git status' no longer starts each line in '#'.
    Match that optionally.

diff --git a/Tests/CMakeTests/CheckSourceTreeTest.cmake.in b/Tests/CMakeTests/CheckSourceTreeTest.cmake.in
index 59b2890..33fe5f3 100644
--- a/Tests/CMakeTests/CheckSourceTreeTest.cmake.in
+++ b/Tests/CMakeTests/CheckSourceTreeTest.cmake.in
@@ -268,12 +268,12 @@ if(NOT ov STREQUAL "")
 
     if(consider)
       if(is_git_checkout)
-        if(line MATCHES "^#[ \t]*modified:")
+        if(line MATCHES "^#?[ \t]*modified:")
           message("   locally modified file detected...")
           set(modifications 1)
         endif()
 
-        if(line MATCHES "^# Untracked")
+        if(line MATCHES "^(# )?Untracked")
           message("   locally non-added file/directory detected...")
           set(nonadditions 1)
         endif()

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

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


hooks/post-receive
-- 
CMake