aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/git/gitclient.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/git/gitclient.cpp')
-rw-r--r--src/plugins/git/gitclient.cpp11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index 70f34604ae3..79b0ea657b0 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -1438,10 +1438,13 @@ bool GitClient::synchronousLog(const QString &workingDirectory, const QStringLis
}
}
-bool GitClient::synchronousAdd(const QString &workingDirectory, const QStringList &files)
+bool GitClient::synchronousAdd(const QString &workingDirectory,
+ const QStringList &files,
+ const QStringList &extraOptions)
{
- return vcsFullySynchronousExec(workingDirectory, QStringList({"add"}) + files).result
- == SynchronousProcessResponse::Finished;
+ QStringList args{"add"};
+ args += extraOptions + files;
+ return vcsFullySynchronousExec(workingDirectory, args).result == SynchronousProcessResponse::Finished;
}
bool GitClient::synchronousDelete(const QString &workingDirectory,
@@ -2890,7 +2893,7 @@ bool GitClient::addAndCommit(const QString &repositoryDirectory,
filesToReset.removeAll(file);
filesToAdd.append(file);
} else if (state == AddedFile && checked) {
- QTC_ASSERT(false, continue); // these should be untracked!
+ filesToAdd.append(file);
} else if (state == DeletedFile && checked) {
filesToReset.removeAll(file);
filesToRemove.append(file);