[Cmake-commits] CMake branch, next, updated. v3.4.1-1684-g64cfea7

[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  64cfea7261834d8075ab5d844e0779bae4c3724c (commit)
       via  4f8ab578a2e9e1221fb56463d02864ed429b8613 (commit)
      from  987c2cf1d8ae76df4bf5bfc93745d898f981bff7 (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=64cfea7261834d8075ab5d844e0779bae4c3724c
commit 64cfea7261834d8075ab5d844e0779bae4c3724c
Merge: 987c2cf 4f8ab57
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Dec 10 13:54:47 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Dec 10 13:54:47 2015 -0500

    Merge topic 'simplify-CTest.UpdateGIT-test' into next
    
    4f8ab578 fixup! Tests: Simplify CTest.UpdateGIT repo path construction


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4f8ab578a2e9e1221fb56463d02864ed429b8613
commit 4f8ab578a2e9e1221fb56463d02864ed429b8613
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Dec 10 13:54:37 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Dec 10 13:54:37 2015 -0500

    fixup! Tests: Simplify CTest.UpdateGIT repo path construction

diff --git a/Tests/CTestUpdateGIT.cmake.in b/Tests/CTestUpdateGIT.cmake.in
index 4731f9e..46230cc 100644
--- a/Tests/CTestUpdateGIT.cmake.in
+++ b/Tests/CTestUpdateGIT.cmake.in
@@ -70,17 +70,17 @@ 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
-  COMMAND ${GIT} init
+run_child(WORKING_DIRECTORY ${TOP}
+  COMMAND ${GIT} clone repo.git import
   )
 file(REMOVE_RECURSE ${TOP}/import/.git/hooks)
 file(APPEND ${TOP}/import/.git/config "
 ${AUTHOR_CONFIG}")
+create_content(import)
+file(WRITE ${TOP}/import/HEAD "HEAD\n")
+file(WRITE ${TOP}/import/master "master\n")
 run_child(WORKING_DIRECTORY ${TOP}/import
   COMMAND ${GIT} add .
   )
@@ -94,7 +94,7 @@ run_child(WORKING_DIRECTORY ${TOP}/import
   COMMAND ${GIT} commit -m "Initial content"
   )
 run_child(WORKING_DIRECTORY ${TOP}/import
-  COMMAND ${GIT} push ../repo.git master:refs/heads/master
+  COMMAND ${GIT} push origin master:refs/heads/master
   )
 
 #-----------------------------------------------------------------------------

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

Summary of changes:
 Tests/CTestUpdateGIT.cmake.in |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake