From 0d187323471237556f603ec8743207c986ea7de2 Mon Sep 17 00:00:00 2001 From: Robert Loehning Date: Thu, 26 Aug 2010 18:42:07 +0200 Subject: VCS[git]: Do not show pseudo branch "(no branch)" --- src/plugins/git/branchmodel.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'src/plugins/git/branchmodel.cpp') diff --git a/src/plugins/git/branchmodel.cpp b/src/plugins/git/branchmodel.cpp index 24ea0684c5..6c7dd789e8 100644 --- a/src/plugins/git/branchmodel.cpp +++ b/src/plugins/git/branchmodel.cpp @@ -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); -- cgit v1.2.1