diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2013-11-17 20:34:31 +0200 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2013-11-18 10:11:14 +0100 |
| commit | 920fa79667f962270fe85a863d90f950b63560f0 (patch) | |
| tree | c3d0667acc6d66098377666152ff8c0016a00fa6 /src/plugins/git/gitclient.cpp | |
| parent | 825244224eedd865d19ef1a772dba955d54bcd60 (diff) | |
| download | qt-creator-920fa79667f962270fe85a863d90f950b63560f0.tar.gz | |
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>
Diffstat (limited to 'src/plugins/git/gitclient.cpp')
| -rw-r--r-- | src/plugins/git/gitclient.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index 693375039d..b9363115f1 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 |