diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index 693375039d46519a3b951f02fe77195d0c29848e..b9363115f17eb8d4dab11895c4290ffe7af337a8 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -1604,18 +1604,12 @@ bool GitClient::synchronousLog(const QString &workingDirectory, const QStringLis return rc; } -// Warning: 'intendToAdd' works only from 1.6.1 onwards -bool GitClient::synchronousAdd(const QString &workingDirectory, - bool intendToAdd, - const QStringList &files) +bool GitClient::synchronousAdd(const QString &workingDirectory, const QStringList &files) { QByteArray outputText; QByteArray errorText; QStringList arguments; - arguments << QLatin1String("add"); - if (intendToAdd) - arguments << QLatin1String("--intent-to-add"); - arguments.append(files); + arguments << QLatin1String("add") << files; const bool rc = fullySynchronousGit(workingDirectory, arguments, &outputText, &errorText); if (!rc) { msgCannotRun(tr("Cannot add %n file(s) to \"%1\": %2", 0, files.size()) @@ -3092,7 +3086,7 @@ bool GitClient::addAndCommit(const QString &repositoryDirectory, if (!filesToRemove.isEmpty() && !synchronousDelete(repositoryDirectory, true, filesToRemove)) return false; - if (!filesToAdd.isEmpty() && !synchronousAdd(repositoryDirectory, false, filesToAdd)) + if (!filesToAdd.isEmpty() && !synchronousAdd(repositoryDirectory, filesToAdd)) return false; // Do the final commit diff --git a/src/plugins/git/gitclient.h b/src/plugins/git/gitclient.h index 69709b903064d5442f491ddeffee313a8da269fc..ff8cc55edc4f5e0b7e8b4dede3ef12566cacbd7e 100644 --- a/src/plugins/git/gitclient.h +++ b/src/plugins/git/gitclient.h @@ -159,10 +159,7 @@ public: bool synchronousLog(const QString &workingDirectory, const QStringList &arguments, QString *output, QString *errorMessage = 0); - bool synchronousAdd(const QString &workingDirectory, - // Warning: Works only from 1.6.1 onwards - bool intendToAdd, - const QStringList &files); + bool synchronousAdd(const QString &workingDirectory, const QStringList &files); bool synchronousDelete(const QString &workingDirectory, bool force, const QStringList &files); diff --git a/src/plugins/git/gitversioncontrol.cpp b/src/plugins/git/gitversioncontrol.cpp index b43c3b0a2d18a27984cd0631916fc4f03172f5a1..95c4890b5ff82f0b5d9f0680b5bc02b0d92fc411 100644 --- a/src/plugins/git/gitversioncontrol.cpp +++ b/src/plugins/git/gitversioncontrol.cpp @@ -86,9 +86,8 @@ bool GitVersionControl::vcsOpen(const QString & /*fileName*/) bool GitVersionControl::vcsAdd(const QString & fileName) { - // Implement in terms of using "--intent-to-add" const QFileInfo fi(fileName); - return m_client->synchronousAdd(fi.absolutePath(), true, QStringList(fi.fileName())); + return m_client->synchronousAdd(fi.absolutePath(), QStringList(fi.fileName())); } bool GitVersionControl::vcsDelete(const QString & fileName)