feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fixed parsing of Git branches when current checkout is not on a branch.

Browse Source
This commit is contained in:
Robert Loehning
2010-03-15 16:49:03 +01:00
parent 40aa17a2e2
commit 8e21546009
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/git/branchmodel.cpp
View File

@@ -50,7 +50,14 @@ bool RemoteBranchModel::Branch::parse(const QString &lineIn, bool *isCurrent)
if (lineIn.size() < 3)
return false;
const QStringList tokens =lineIn.mid(2).split(QLatin1Char(' '), QString::SkipEmptyParts);
const QString branchInfo = lineIn.mid(2);
QStringList tokens;
if (*isCurrent && branchInfo.startsWith(QLatin1String("(no branch)"))) {
tokens += tr("(no branch)");
tokens += branchInfo.mid(11).split(QLatin1Char(' '), QString::SkipEmptyParts);
} else {
tokens = branchInfo.split(QLatin1Char(' '), QString::SkipEmptyParts);
}
if (tokens.size() < 2)
return false;
name = tokens.at(0);