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

Git: Fix stash names

Browse Source 
Fix detection of stash names.

Task-number: QTCREATORBUG-2934
This commit is contained in:
Tobias Hunger
2010-10-29 14:18:08 +02:00
parent 9dd9475e84
commit 7c36f47277
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/git/gitutils.cpp
View File

@@ -67,20 +67,14 @@ bool Stash::parseStashLine(const QString &l)
const int messagePos = l.indexOf(colon, branchPos + 1);
if (messagePos < 0)
return false;
// Name
const QString newName = l.left(branchPos);
// Branch spec
const QString branchSpec = l.mid(branchPos + 1, messagePos - branchPos - 1);
const bool emptyMessage = branchSpec.contains(QLatin1String("WIP")); // "Work in Progress or sth"
const int onIndex = branchSpec.indexOf(QLatin1String("on "), 0, Qt::CaseInsensitive);
if (onIndex == -1)
const int onIndex = l.indexOf(QLatin1String("on "), branchPos + 2, Qt::CaseInsensitive);
if (onIndex == -1 || onIndex >= messagePos)
return false;
const QString newBranch = branchSpec.mid(onIndex + 3);
// Happy!
name = newName;
branch = newBranch;
if (!emptyMessage)
message = l.mid(messagePos + 2); // skip blank
name = l.left(branchPos);
branch = l.mid(onIndex + 3, messagePos - onIndex - 3);
message = l.mid(messagePos + 2); // skip blank
return true;
}