From c3f018b0a2b232d8211ccc5048e2d698fbddab6a Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@nokia.com>
Date: Thu, 3 Mar 2011 16:33:24 +0100
Subject: [PATCH] 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
---
 src/plugins/git/commitdata.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/plugins/git/commitdata.cpp b/src/plugins/git/commitdata.cpp
index d18b5f118a1..813e287409b 100644
--- a/src/plugins/git/commitdata.cpp
+++ b/src/plugins/git/commitdata.cpp
@@ -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;
         }