From 65cb72f7583a25bd3bec3f6a41a7a71cffa44ee2 Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 20 Jul 2010 16:57:50 -0400 Subject: 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. --- Source/CTest/cmCTestGIT.cxx | 6 ++++++ 1 file changed, 6 insertions(+) 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. -- cgit v0.12