Commit c3f018b0 authored by Tobias Hunger's avatar Tobias Hunger
Browse files

Git: Update for git 1.7.4

Handle git status output as done by git 1.7.4. Thanks to BogDan Vatra
for pointing out this issue.

TaskNumber: QTCREATORBUG-3697
parent cb7cca79
......@@ -147,6 +147,7 @@ bool CommitData::parseFilesFromStatus(const QString &output)
const QString branchIndicator = QLatin1String(kBranchIndicatorC);
const QString commitIndicator = QLatin1String("# Changes to be committed:");
const QString notUpdatedIndicator = QLatin1String("# Changed but not updated:");
const QString notUpdatedIndicatorGit174 = QLatin1String("# Changes not staged for commit:");
const QString untrackedIndicator = QLatin1String("# Untracked files:");
State s = None;
......@@ -165,7 +166,7 @@ bool CommitData::parseFilesFromStatus(const QString &output)
s = CommitFiles;
continue;
}
if (line.startsWith(notUpdatedIndicator)) {
if (line.startsWith(notUpdatedIndicator) || line.startsWith(notUpdatedIndicatorGit174)) {
s = NotUpdatedFiles;
continue;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment