[Cmake-commits] CMake branch, master, updated. v2.8.2-133-ge6067ca
Brad King
brad.king at kitware.com
Tue Aug 3 16:07:32 EDT 2010
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, master has been updated
via e6067ca969edb2f20f4fc17735d74924f534b1a5 (commit)
via a7319cf1c155a0e82c88689c0b4fe54b389a580e (commit)
via 7bf8dc1ac9d2c2430e247c2cfb54a6a4cb5f698a (commit)
via 65cb72f7583a25bd3bec3f6a41a7a71cffa44ee2 (commit)
from 8342eacda7dd78c8776de63d7fe300d751f26f61 (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=e6067ca969edb2f20f4fc17735d74924f534b1a5
commit e6067ca969edb2f20f4fc17735d74924f534b1a5
Merge: 8342eac a7319cf
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Aug 3 16:07:31 2010 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Aug 3 16:07:31 2010 -0400
Merge topic 'ctest-git-flexibility'
a7319cf ctest_update: Run 'git submodule' at top level
7bf8dc1 ctest_update: Support ".git file" work trees
65cb72f ctest_update: Abort if Git FETCH_HEAD has no candidates
diff --cc Tests/CTestUpdateGIT.cmake.in
index f672a52,e1d345c..793b987
--- a/Tests/CTestUpdateGIT.cmake.in
+++ b/Tests/CTestUpdateGIT.cmake.in
@@@ -275,9 -259,14 +275,14 @@@ execute_process
WORKING_DIRECTORY \"${TOP}\"
COMMAND \"${GIT}\" clone \"${REPO}\" dash-source
)
+
+ # Test .git file.
+ file(RENAME \"${TOP}/dash-source/.git\" \"${TOP}/dash-source/repo.git\")
+ file(WRITE \"${TOP}/dash-source/.git\" \"gitdir: repo.git\n\")
+
execute_process(
WORKING_DIRECTORY \"${TOP}/dash-source\"
- COMMAND \"${GIT}\" reset --hard master~2
+ COMMAND \"${GIT}\" reset --hard ${revision1}
)
execute_process(
WORKING_DIRECTORY \"${TOP}/dash-source\"
-----------------------------------------------------------------------
Summary of changes:
Source/CTest/cmCTestGIT.cxx | 86 ++++++++++++++++++++++++++++++++++++++++-
Source/CTest/cmCTestGIT.h | 3 +
Tests/CTestUpdateGIT.cmake.in | 5 ++
3 files changed, 92 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list