[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2356-g810d5c6

[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  810d5c6d5f66f3d4f04cf69cb83b76e5f21d2ca1 (commit)
       via  78b81b773c428b6575ea50369a96e26fdfa586df (commit)
       via  42c56c824c719a640471a622f710b0b86ee02abc (commit)
      from  161ec93241ec565fc68e03e78059562826b06545 (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=810d5c6d5f66f3d4f04cf69cb83b76e5f21d2ca1
commit 810d5c6d5f66f3d4f04cf69cb83b76e5f21d2ca1
Merge: 161ec93 78b81b7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 28 11:56:41 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 28 11:56:41 2013 -0500

    Merge topic 'ctest_update-Git-HEAD' into next
    
    78b81b7 CTest: Fix ctest_update with 'HEAD' file in source tree
    42c56c8 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=78b81b773c428b6575ea50369a96e26fdfa586df
commit 78b81b773c428b6575ea50369a96e26fdfa586df
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 28 11:52:30 2013 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 28 11:52:30 2013 -0500

    CTest: Fix ctest_update with 'HEAD' file in source tree
    
    Add the '--' command-line separator to make the HEAD reference
    unambiguous.  Extend the CTest.UpdateGIT test to cover this case.

diff --git a/Source/CTest/cmCTestGIT.cxx b/Source/CTest/cmCTestGIT.cxx
index 2c1a0af..5b34491 100644
--- a/Source/CTest/cmCTestGIT.cxx
+++ b/Source/CTest/cmCTestGIT.cxx
@@ -68,7 +68,7 @@ std::string cmCTestGIT::GetWorkingRevision()
 {
   // Run plumbing "git rev-list" to get work tree revision.
   const char* git = this->CommandLineTool.c_str();
-  const char* git_rev_list[] = {git, "rev-list", "-n", "1", "HEAD", 0};
+  const char* git_rev_list[] = {git, "rev-list", "-n", "1", "HEAD", "--", 0};
   std::string rev;
   OneLineParser out(this, "rl-out> ", rev);
   OutputLogger err(this->Log, "rl-err> ");
@@ -639,7 +639,7 @@ void cmCTestGIT::LoadModifications()
   this->RunChild(git_update_index, &ui_out, &ui_err);
 
   // Use 'git diff-index' to get modified files.
-  const char* git_diff_index[] = {git, "diff-index", "-z", "HEAD", 0};
+  const char* git_diff_index[] = {git, "diff-index", "-z", "HEAD", "--", 0};
   DiffParser out(this, "di-out> ");
   OutputLogger err(this->Log, "di-err> ");
   this->RunChild(git_diff_index, &out, &err);
diff --git a/Tests/CTestUpdateGIT.cmake.in b/Tests/CTestUpdateGIT.cmake.in
index 0c01291..f6939de 100644
--- a/Tests/CTestUpdateGIT.cmake.in
+++ b/Tests/CTestUpdateGIT.cmake.in
@@ -76,6 +76,8 @@ run_child(WORKING_DIRECTORY ${TOP}/module
 # Import initial content into the repository.
 message("Importing content...")
 create_content(import)
+file(WRITE ${TOP}/import/HEAD "HEAD\n")
+file(WRITE ${TOP}/import/master "master\n")
 
 # Import the content into the repository.
 run_child(WORKING_DIRECTORY ${TOP}/import
@@ -157,19 +159,19 @@ update_content(user-source files_added files_removed dirs_added)
 if(dirs_added)
   run_child(
     WORKING_DIRECTORY ${TOP}/user-source
-    COMMAND ${GIT} add ${dirs_added}
+    COMMAND ${GIT} add -- ${dirs_added}
     )
 endif()
 run_child(
   WORKING_DIRECTORY ${TOP}/user-source
-  COMMAND ${GIT} add ${files_added}
+  COMMAND ${GIT} add -- ${files_added}
   )
 run_child(
   WORKING_DIRECTORY ${TOP}/user-source
-  COMMAND ${GIT} rm ${files_removed}
+  COMMAND ${GIT} rm -- ${files_removed}
   )
 run_child(WORKING_DIRECTORY ${TOP}/user-source/module
-  COMMAND ${GIT} checkout master
+  COMMAND ${GIT} checkout master --
   )
 run_child(
   WORKING_DIRECTORY ${TOP}/user-source

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

Summary of changes:
 Source/CMakeVersion.cmake     |    2 +-
 Source/CTest/cmCTestGIT.cxx   |    4 ++--
 Tests/CTestUpdateGIT.cmake.in |   10 ++++++----
 3 files changed, 9 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake