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

VCS[git]: Do not show pseudo branch "(no branch)"

Browse Source
This commit is contained in:
Robert Loehning
2010-08-26 18:42:07 +02:00
parent ce24dfa378
commit 0d18732347
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,8 +40,7 @@ enum { debug = 0 };
namespace Git {
namespace Internal {
// Parse a branch line: " *name sha description". Return true if it is
// the current one
// Parse a branch line: " *name sha description".
bool RemoteBranchModel::Branch::parse(const QString &lineIn, bool *isCurrent)
{
if (debug)
@@ -53,12 +52,10 @@ bool RemoteBranchModel::Branch::parse(const QString &lineIn, bool *isCurrent)
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 {
if (*isCurrent && branchInfo.startsWith(QLatin1String("(no branch)")))
return false;
else
tokens = branchInfo.split(QLatin1Char(' '), QString::SkipEmptyParts);
}
if (tokens.size() < 2)
return false;
name = tokens.at(0);