diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2013-01-24 11:32:45 +0200 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2013-01-24 13:25:06 +0100 |
| commit | cf5f109b6841231232a3fe58308d893910d3a209 (patch) | |
| tree | 20a60f9d6c2d9aaf9898bf3c2569437de8de4370 /src/plugins/git/gitversioncontrol.cpp | |
| parent | a85c32cb4aea1357abc44e0aa41bc573135b9d69 (diff) | |
| download | qt-creator-cf5f109b6841231232a3fe58308d893910d3a209.tar.gz | |
Git: Remove "Branch" from synchronousCheckoutBranch
Other refs can also be checked out using this function
Change-Id: I80a1c15244b1043cfce650a121c71174b9d322cb
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Diffstat (limited to 'src/plugins/git/gitversioncontrol.cpp')
| -rw-r--r-- | src/plugins/git/gitversioncontrol.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/git/gitversioncontrol.cpp b/src/plugins/git/gitversioncontrol.cpp index 752c607ba7..9ffaa79570 100644 --- a/src/plugins/git/gitversioncontrol.cpp +++ b/src/plugins/git/gitversioncontrol.cpp @@ -208,10 +208,10 @@ bool GitVersionControl::vcsRestoreSnapshot(const QString &topLevel, const QStrin const QString revision = tokens.at(2); success = m_client->synchronousReset(topLevel); if (success && !branch.isEmpty()) { - success = m_client->synchronousCheckoutBranch(topLevel, branch) && + success = m_client->synchronousCheckout(topLevel, branch) && m_client->synchronousCheckoutFiles(topLevel, QStringList(), revision); } else { - success = m_client->synchronousCheckoutBranch(topLevel, revision); + success = m_client->synchronousCheckout(topLevel, revision); } } else { // Restore stash if it can be resolved. |