From 30d548ea3a9c8886519374665a64a0ebda4c6c9a Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Tue, 25 Dec 2012 11:15:14 +0200 Subject: [PATCH] Git: Really consider untracked flag 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 Reviewed-by: Tobias Hunger --- src/plugins/git/gitclient.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index d4d1c03437b..40f6b356b0d 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -1624,8 +1624,8 @@ GitClient::StatusResult GitClient::gitStatus(const QString &workingDirectory, bo QByteArray errorText; QStringList statusArgs(QLatin1String("status")); - if (untracked) - statusArgs << QLatin1String("-u"); + if (!untracked) + statusArgs << QLatin1String("--untracked-files=no"); statusArgs << QLatin1String("-s") << QLatin1String("-b"); 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) QList lines = outputText.split('\n'); foreach (const QByteArray &line, lines) - if (!line.isEmpty() && !line.startsWith('#') && !line.startsWith('?')) + if (!line.isEmpty() && !line.startsWith('#')) return StatusChanged; return StatusUnchanged; }