kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Brad King 2010-07-20 16:57:50 -04:00
parent c3781efb28
commit 65cb72f758
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/CTest/cmCTestGIT.cxx
View File

@ -126,6 +126,7 @@ bool cmCTestGIT::UpdateByFetchAndReset()
std::string line; std::string line;
while(sha1.empty() && cmSystemTools::GetLineFromStream(fin, line)) while(sha1.empty() && cmSystemTools::GetLineFromStream(fin, line))
{ {
this->Log << "FETCH_HEAD> " << line << "\n";
if(line.find("\tnot-for-merge\t") == line.npos) if(line.find("\tnot-for-merge\t") == line.npos)
{ {
std::string::size_type pos = line.find('\t'); 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. // Reset the local branch to point at that tracked from upstream.