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

Git: Better status resolving

Browse Source 
Do not consider new files as Changed

Change-Id: Id1ddb870e51a974a2d20fc2ecc9fb499d1db6f8c
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
This commit is contained in:
Orgad Shaneh
2012-06-25 14:30:46 +03:00
committed by Tobias Hunger
parent 17eedb2af9
commit 616cb86ea7
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/git/gitclient.cpp
View File

@@ -1552,9 +1552,11 @@ GitClient::StatusResult GitClient::gitStatus(const QString &workingDirectory, bo
return StatusFailed; return StatusFailed;
} }
// Unchanged (output text depending on whether -u was passed) // Unchanged (output text depending on whether -u was passed)
if (outputText.count('\n') == 1) QList<QByteArray> lines = outputText.split('\n');
return StatusUnchanged; foreach (const QByteArray &line, lines)
return StatusChanged; if (!line.isEmpty() && !line.startsWith('#') && !line.startsWith('?'))
return StatusChanged;
return StatusUnchanged;
} }
// Quietly retrieve branch list of remote repository URL // Quietly retrieve branch list of remote repository URL