From 920fa79667f962270fe85a863d90f950b63560f0 Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Sun, 17 Nov 2013 20:34:31 +0200
Subject: [PATCH] Git: Really add new/existing files
Task-number: QTCREATORBUG-10117
Change-Id: Ic254cb2f7860ca0973cfda58cf66f62b1b8eaeb7
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
---
src/plugins/git/gitclient.cpp | 12 +++---------
src/plugins/git/gitclient.h | 5 +----
src/plugins/git/gitversioncontrol.cpp | 3 +--
3 files changed, 5 insertions(+), 15 deletions(-)
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index 693375039d4..b9363115f17 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 69709b90306..ff8cc55edc4 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 b43c3b0a2d1..95c4890b5ff 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)
--
GitLab