From 616cb86ea72c494185efda77c302588a815a6143 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Mon, 25 Jun 2012 14:30:46 +0300 Subject: [PATCH] Git: Better status resolving Do not consider new files as Changed Change-Id: Id1ddb870e51a974a2d20fc2ecc9fb499d1db6f8c Reviewed-by: Tobias Hunger --- src/plugins/git/gitclient.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index 65baccc8586..942265a2176 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -1552,9 +1552,11 @@ GitClient::StatusResult GitClient::gitStatus(const QString &workingDirectory, bo return StatusFailed; } // Unchanged (output text depending on whether -u was passed) - if (outputText.count('\n') == 1) - return StatusUnchanged; - return StatusChanged; + QList lines = outputText.split('\n'); + foreach (const QByteArray &line, lines) + if (!line.isEmpty() && !line.startsWith('#') && !line.startsWith('?')) + return StatusChanged; + return StatusUnchanged; } // Quietly retrieve branch list of remote repository URL