forked from qt-creator/qt-creator
Git: Ignore submodules for status except for commit
Submodules are not stashed and are not considered a conflict after revert Change-Id: I97a0792db615054622b9b67a7f6b58b5aee05273 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
@@ -70,6 +70,13 @@ class CommitData;
|
||||
struct GitSubmitEditorPanelData;
|
||||
class Stash;
|
||||
|
||||
enum StatusMode
|
||||
{
|
||||
ShowAll = 0,
|
||||
NoUntracked = 1,
|
||||
NoSubmodules = 2
|
||||
};
|
||||
|
||||
class GitClient : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
@@ -210,7 +217,7 @@ public:
|
||||
|
||||
enum StatusResult { StatusChanged, StatusUnchanged, StatusFailed };
|
||||
StatusResult gitStatus(const QString &workingDirectory,
|
||||
bool untracked = false,
|
||||
StatusMode mode,
|
||||
QString *output = 0,
|
||||
QString *errorMessage = 0);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user