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

Git: Do not prompt to add files in a submodule

Browse Source 
Fixes: QTCREATORBUG-23845
Change-Id: Ibf20eed26469b5a8599927e5ac2d458bbff9a156
Reviewed-by: André Hartmann <aha_1980@gmx.de>
This commit is contained in:
Orgad Shaneh
2020-09-27 16:01:14 +03:00
committed by Orgad Shaneh
parent c0b001737c
commit 48c56416f5
6 changed files with 34 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/git/gitplugin.cpp
View File

@@ -239,7 +239,7 @@ public:
bool managesDirectory(const QString &directory, QString *topLevel) const final;
bool managesFile(const QString &workingDirectory, const QString &fileName) const final;
QStringList unmanagedFiles(const QString &workingDir, const QStringList &filePaths) const final;
QStringList unmanagedFiles(const QStringList &filePaths) const final;
bool isConfigured() const final;
bool supportsOperation(Operation operation) const final;
@@ -1950,10 +1950,9 @@ bool GitPluginPrivate::managesFile(const QString &workingDirectory, const QStrin
return m_gitClient.managesFile(workingDirectory, fileName);
}
QStringList GitPluginPrivate::unmanagedFiles(const QString &workingDir,
const QStringList &filePaths) const
QStringList GitPluginPrivate::unmanagedFiles(const QStringList &filePaths) const
{
return m_gitClient.unmanagedFiles(workingDir, filePaths);
return m_gitClient.unmanagedFiles(filePaths);
}
void GitPluginPrivate::vcsAnnotate(const QString &file, int line)