|
|
@@ -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.
|