[Cmake-commits] CMake branch, next, updated. v2.8.2-265-gebe0f00

[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  ebe0f00bdbf89b2fa88f15c41faccbd8908e19da (commit)
       via  65cb72f7583a25bd3bec3f6a41a7a71cffa44ee2 (commit)
      from  0c23f746a168b08c95b2e7700e4afa2379711615 (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=ebe0f00bdbf89b2fa88f15c41faccbd8908e19da
commit ebe0f00bdbf89b2fa88f15c41faccbd8908e19da
Merge: 0c23f74 65cb72f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 20 17:03:35 2010 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jul 20 17:03:35 2010 -0400

    Merge topic 'ctest-git-flexibility' into next
    
    65cb72f ctest_update: Abort if Git FETCH_HEAD has no candidates


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=65cb72f7583a25bd3bec3f6a41a7a71cffa44ee2
commit 65cb72f7583a25bd3bec3f6a41a7a71cffa44ee2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 20 16:57:50 2010 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jul 20 16:57:50 2010 -0400

    ctest_update: Abort if Git FETCH_HEAD has no candidates
    
    If .git/FETCH_HEAD provides no merge candidate do not attempt to update.
    Also log FETCH_HEAD lines as we parse them since they are essentially
    output from the git fetch command.

diff --git a/Source/CTest/cmCTestGIT.cxx b/Source/CTest/cmCTestGIT.cxx
index 6c3631c..41c1393 100644
--- a/Source/CTest/cmCTestGIT.cxx
+++ b/Source/CTest/cmCTestGIT.cxx
@@ -126,6 +126,7 @@ bool cmCTestGIT::UpdateByFetchAndReset()
   std::string line;
   while(sha1.empty() && cmSystemTools::GetLineFromStream(fin, line))
     {
+    this->Log << "FETCH_HEAD> " << line << "\n";
     if(line.find("\tnot-for-merge\t") == line.npos)
       {
       std::string::size_type pos = line.find('\t');
@@ -135,6 +136,11 @@ bool cmCTestGIT::UpdateByFetchAndReset()
         }
       }
     }
+  if(sha1.empty())
+    {
+    this->Log << "FETCH_HEAD has no upstream branch candidate!\n";
+    return false;
+    }
   }
 
   // Reset the local branch to point at that tracked from upstream.

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

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


hooks/post-receive
-- 
CMake