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

Git/Clean: Fix issues with submodules

Browse Source 
- If the git config contained old entries for submodules that were
  removed (they are not cleaned from the config automatically),
  it would add submodules with empty "dir", which lead to infinite
  recursion

- When recursing into submodules, we need to prepend the paths from the
  git output with the relative path from the main repository

Change-Id: I0bc6a1973f4cdeb1c3f09c05cd7736c25471f72e
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Eike Ziller
2016-01-21 15:31:37 +01:00
parent a081e8c96f
commit a6f5548331
3 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/git/gitclient.h
View File

@@ -179,7 +179,7 @@ public:
bool synchronousReset(const QString &workingDirectory,
const QStringList &files = QStringList(),
QString *errorMessage = 0);
bool synchronousCleanList(const QString &workingDirectory, QStringList *files, QStringList *ignoredFiles, QString *errorMessage);
bool synchronousCleanList(const QString &workingDirectory, const QString &modulePath, QStringList *files, QStringList *ignoredFiles, QString *errorMessage);
bool synchronousApplyPatch(const QString &workingDirectory, const QString &file, QString *errorMessage, const QStringList &arguments = QStringList());
bool synchronousInit(const QString &workingDirectory);
bool synchronousCheckoutFiles(const QString &workingDirectory,
@@ -377,7 +377,7 @@ private:
const QString &workingDirectory,
const QString &fileName,
const QString &gitBinDirectory);
bool cleanList(const QString &workingDirectory, const QString &flag, QStringList *files, QString *errorMessage);
bool cleanList(const QString &workingDirectory, const QString &modulePath, const QString &flag, QStringList *files, QString *errorMessage);
enum ContinueCommandMode {
ContinueOnly,