diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index 258e8cb6c5c..79af79a2876 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -1283,7 +1283,6 @@ bool GitClient::synchronousRevListCmd(const QString &workingDirectory, const QSt // Find out the immediate parent revisions of a revision of the repository. // Might be several in case of merges. bool GitClient::synchronousParentRevisions(const QString &workingDirectory, - const QStringList &files /* = QStringList() */, const QString &revision, QStringList *parents, QString *errorMessage) const @@ -1296,10 +1295,6 @@ bool GitClient::synchronousParentRevisions(const QString &workingDirectory, return true; } arguments << QLatin1String("--parents") << QLatin1String("--max-count=1") << revision; - if (!files.isEmpty()) { - arguments.append(QLatin1String("--")); - arguments.append(files); - } if (!synchronousRevListCmd(workingDirectory, arguments, &outputText, &errorText)) { *errorMessage = msgParentRevisionFailed(workingDirectory, revision, errorText); @@ -1475,7 +1470,7 @@ void GitClient::synchronousTagsForCommit(const QString &workingDirectory, const QStringList parents; QString errorMessage; - synchronousParentRevisions(workingDirectory, QStringList(), revision, &parents, &errorMessage); + synchronousParentRevisions(workingDirectory, revision, &parents, &errorMessage); foreach (const QString &p, parents) { QByteArray pf; arguments.clear(); diff --git a/src/plugins/git/gitclient.h b/src/plugins/git/gitclient.h index d226c686d54..51825a768f0 100644 --- a/src/plugins/git/gitclient.h +++ b/src/plugins/git/gitclient.h @@ -237,7 +237,6 @@ public: QString *output, QString *errorMessage = 0) const; bool synchronousParentRevisions(const QString &workingDirectory, - const QStringList &files /* = QStringList() */, const QString &revision, QStringList *parents, QString *errorMessage) const; diff --git a/src/plugins/git/giteditor.cpp b/src/plugins/git/giteditor.cpp index 944a9ba676d..45fee1db5dd 100644 --- a/src/plugins/git/giteditor.cpp +++ b/src/plugins/git/giteditor.cpp @@ -309,8 +309,7 @@ QStringList GitEditorWidget::annotationPreviousVersions(const QString &revision) const QFileInfo fi(source()); const QString workingDirectory = fi.absolutePath(); // Get the SHA1's of the file. - if (!client->synchronousParentRevisions(workingDirectory, QStringList(fi.fileName()), - revision, &revisions, &errorMessage)) { + if (!client->synchronousParentRevisions(workingDirectory, revision, &revisions, &errorMessage)) { VcsOutputWindow::appendSilently(errorMessage); return QStringList(); }