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

Git: Really consider untracked flag

Browse Source 
Default behavior is to show all untracked files. To hide them,
we need to pass --untracked-files=no

Change-Id: I45ad6323273112e6724127d4bd8e8687066467f4
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2012-12-25 11:15:14 +02:00
parent 60129c40ef
commit 30d548ea3a
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1624,8 +1624,8 @@ GitClient::StatusResult GitClient::gitStatus(const QString &workingDirectory, bo
QByteArray errorText; QByteArray errorText;
QStringList statusArgs(QLatin1String("status")); QStringList statusArgs(QLatin1String("status"));
if (untracked) if (!untracked)
statusArgs << QLatin1String("-u"); statusArgs << QLatin1String("--untracked-files=no");
statusArgs << QLatin1String("-s") << QLatin1String("-b"); statusArgs << QLatin1String("-s") << QLatin1String("-b");
const bool statusRc = fullySynchronousGit(workingDirectory, statusArgs, &outputText, &errorText); const bool statusRc = fullySynchronousGit(workingDirectory, statusArgs, &outputText, &errorText);
@@ -1646,7 +1646,7 @@ GitClient::StatusResult GitClient::gitStatus(const QString &workingDirectory, bo
// Unchanged (output text depending on whether -u was passed) // Unchanged (output text depending on whether -u was passed)
QList<QByteArray> lines = outputText.split('\n'); QList<QByteArray> lines = outputText.split('\n');
foreach (const QByteArray &line, lines) foreach (const QByteArray &line, lines)
if (!line.isEmpty() && !line.startsWith('#') && !line.startsWith('?')) if (!line.isEmpty() && !line.startsWith('#'))
return StatusChanged; return StatusChanged;
return StatusUnchanged; return StatusUnchanged;
} }