From 120f03061dacc4f567d86640afdc3eafbf3a06d3 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Thu, 24 Jan 2013 11:30:30 +0200 Subject: [PATCH] Git: Remove unused functions Change-Id: I6cb9752f435255379cf7a8a321b3192a410d91df Reviewed-by: Tobias Hunger --- src/plugins/git/gitclient.cpp | 22 ---------------------- src/plugins/git/gitclient.h | 2 -- 2 files changed, 24 deletions(-) diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index 283b52a66a7..e66c17bb93f 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -778,14 +778,6 @@ void GitClient::blame(const QString &workingDirectory, executeGit(workingDirectory, arguments, editor, false, VcsBase::Command::NoReport, lineNumber); } -void GitClient::checkoutBranch(const QString &workingDirectory, const QString &branch) -{ - QStringList arguments(QLatin1String("checkout")); - arguments << branch; - VcsBase::Command *cmd = executeGit(workingDirectory, arguments, 0, true); - connectRepositoryChanged(workingDirectory, cmd); -} - bool GitClient::synchronousCheckoutBranch(const QString &workingDirectory, const QString &branch, QString *errorMessage /* = 0 */) @@ -810,20 +802,6 @@ bool GitClient::synchronousCheckoutBranch(const QString &workingDirectory, return true; } -void GitClient::checkout(const QString &workingDirectory, const QString &fileName) -{ - // Passing an empty argument as the file name is very dangereous, since this makes - // git checkout apply to all files. Almost looks like a bug in git. - if (fileName.isEmpty()) - return; - - QStringList arguments; - arguments << QLatin1String("checkout") << QLatin1String("HEAD") << QLatin1String("--") - << fileName; - - executeGit(workingDirectory, arguments, 0, true); -} - void GitClient::hardReset(const QString &workingDirectory, const QString &commit) { QStringList arguments; diff --git a/src/plugins/git/gitclient.h b/src/plugins/git/gitclient.h index 9c3e0bb2c75..1063bac098f 100644 --- a/src/plugins/git/gitclient.h +++ b/src/plugins/git/gitclient.h @@ -129,8 +129,6 @@ public: bool enableAnnotationContextMenu = false, const QStringList &args = QStringList()); void blame(const QString &workingDirectory, const QStringList &args, const QString &fileName, const QString &revision = QString(), int lineNumber = -1); - void checkout(const QString &workingDirectory, const QString &file); - void checkoutBranch(const QString &workingDirectory, const QString &branch); void hardReset(const QString &workingDirectory, const QString &commit = QString()); void softReset(const QString &workingDirectory, const QString &commit); void addFile(const QString &workingDirectory, const QString &fileName);