[Cmake-commits] CMake branch, next, updated. v2.8.1-1313-g4a94687

[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  4a94687fa4435dd468cae62bbdc9f755aee49362 (commit)
       via  d0a1b9efd00ae2a6125f46dc7a4a8114e5afc61a (commit)
      from  a36f275c5686682588e6c688e1203cac2fe1c7cb (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=4a94687fa4435dd468cae62bbdc9f755aee49362
commit 4a94687fa4435dd468cae62bbdc9f755aee49362
Merge: a36f275 d0a1b9e
Author: Brad King <brad.king at kitware.com>
Date:   Fri Jun 4 17:06:18 2010 -0400

    Merge branch 'ctest-update-git-submodule' into next


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d0a1b9efd00ae2a6125f46dc7a4a8114e5afc61a
commit d0a1b9efd00ae2a6125f46dc7a4a8114e5afc61a
Author: Brad King <brad.king at kitware.com>
Date:   Fri Jun 4 17:01:23 2010 -0400

    Fix ctest_update log prefix for git submodule update
    
    Commit 67277bac (Teach ctest_update about Git submodules, 2010-05-04)
    accidentally logged "git submodule update" with the prefixes "pull-out"
    and "pull-err".  Fix it to use "submodule-out" and "submodule-err"
    instead.

diff --git a/Source/CTest/cmCTestGIT.cxx b/Source/CTest/cmCTestGIT.cxx
index 156a938..f5ba361 100644
--- a/Source/CTest/cmCTestGIT.cxx
+++ b/Source/CTest/cmCTestGIT.cxx
@@ -119,7 +119,7 @@ bool cmCTestGIT::UpdateImpl()
     char const* git_submodule[] = {git, "submodule", "update", 0};
     OutputLogger out2(this->Log, "submodule-out> ");
     OutputLogger err2(this->Log, "submodule-err> ");
-    return this->RunChild(git_submodule, &out, &err);
+    return this->RunChild(git_submodule, &out2, &err2);
     }
   return false;
 }

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

Summary of changes:
 Source/CTest/cmCTestGIT.cxx |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake