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

Git: Update for git 1.7.4

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

TaskNumber: QTCREATORBUG-3697
This commit is contained in:
Tobias Hunger
2011-03-03 16:33:24 +01:00
parent cb7cca793a
commit c3f018b0a2
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/git/commitdata.cpp
View File

@@ -147,6 +147,7 @@ bool CommitData::parseFilesFromStatus(const QString &output)
const QString branchIndicator = QLatin1String(kBranchIndicatorC); const QString branchIndicator = QLatin1String(kBranchIndicatorC);
const QString commitIndicator = QLatin1String("# Changes to be committed:"); const QString commitIndicator = QLatin1String("# Changes to be committed:");
const QString notUpdatedIndicator = QLatin1String("# Changed but not updated:"); const QString notUpdatedIndicator = QLatin1String("# Changed but not updated:");
const QString notUpdatedIndicatorGit174 = QLatin1String("# Changes not staged for commit:");
const QString untrackedIndicator = QLatin1String("# Untracked files:"); const QString untrackedIndicator = QLatin1String("# Untracked files:");
State s = None; State s = None;
@@ -165,7 +166,7 @@ bool CommitData::parseFilesFromStatus(const QString &output)
s = CommitFiles; s = CommitFiles;
continue; continue;
} }
if (line.startsWith(notUpdatedIndicator)) { if (line.startsWith(notUpdatedIndicator) || line.startsWith(notUpdatedIndicatorGit174)) {
s = NotUpdatedFiles; s = NotUpdatedFiles;
continue; continue;
} }