diff options
author | Orgad Shaneh <[email protected]> | 2012-07-01 17:55:22 +0300 |
---|---|---|
committer | Tobias Hunger <[email protected]> | 2012-07-02 11:13:33 +0200 |
commit | 202ce8ad704ebe7281363054427cce3cba465b17 (patch) | |
tree | 97aa5ecfb1beae80ed6c100bc9326eaff2017fe8 /src/plugins/git/gitclient.h | |
parent | 3b5c40ba4738a9f2997a7f4bd75d38070147335e (diff) |
Git: Improve Clean dialog
Check file iff it is not ignored
Change-Id: I16a489bdd772ea9b4df462b449a23324b5ef3b77
Reviewed-by: Tobias Hunger <[email protected]>
Diffstat (limited to 'src/plugins/git/gitclient.h')
-rw-r--r-- | src/plugins/git/gitclient.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/git/gitclient.h b/src/plugins/git/gitclient.h index 39136116ae1..48e37959c1c 100644 --- a/src/plugins/git/gitclient.h +++ b/src/plugins/git/gitclient.h @@ -122,7 +122,7 @@ public: bool synchronousReset(const QString &workingDirectory, const QStringList &files = QStringList(), QString *errorMessage = 0); - bool synchronousCleanList(const QString &workingDirectory, QStringList *files, QString *errorMessage); + bool synchronousCleanList(const QString &workingDirectory, QStringList *files, QStringList *ignoredFiles, QString *errorMessage); bool synchronousApplyPatch(const QString &workingDirectory, const QString &file, QString *errorMessage); bool synchronousInit(const QString &workingDirectory); bool synchronousCheckoutFiles(const QString &workingDirectory, @@ -289,6 +289,7 @@ private: const QString &workingDirectory, const QString &gitBinDirectory, bool silent); + bool cleanList(const QString &workingDirectory, const QString &flag, QStringList *files, QString *errorMessage); mutable QString m_gitVersionForBinary; mutable unsigned m_cachedGitVersion; |