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

Git: Fix thinko when trying to find merged branches

Browse Source 
Fix thinko when trying to find out whether a branch was merged or not.

Change-Id: I6c4d600508af8a68fe0bac7e61f0b912c43cec32
Reviewed-on: http://codereview.qt.nokia.com/2200
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
This commit is contained in:
Tobias Hunger
2011-07-26 13:13:04 +00:00
committed by Robert Löhning
parent dd91cbcf80
commit 2ec4de7ae7
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -470,15 +470,18 @@ bool BranchModel::branchIsMerged(const QModelIndex &idx)
QString output; QString output;
QStringList args; QStringList args;
args << QLatin1String("--contains") << sha(idx); args << QLatin1String("-a") << QLatin1String("--contains") << sha(idx);
if (!m_client->synchronousBranchCmd(m_workingDirectory, args, &output, &errorMessage)) { if (!m_client->synchronousBranchCmd(m_workingDirectory, args, &output, &errorMessage)) {
VCSBase::VCSBaseOutputWindow::instance()->appendError(errorMessage); VCSBase::VCSBaseOutputWindow::instance()->appendError(errorMessage);
return false; return false;
} }
QStringList lines = output.split(QLatin1Char('/'), QString::SkipEmptyParts); QStringList lines = output.split(QLatin1Char('\n'), QString::SkipEmptyParts);
foreach (const QString &l, lines) { foreach (const QString &l, lines) {
if (l.startsWith(QLatin1String(" ")) && l.count() >= 3) QString currentBranch = l.mid(2); // remove first letters (those are either
// " " or "* " depending on whether it is
// the currently checked out branch or not)
if (currentBranch != branch)
return true; return true;
} }
return false; return false;