feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Git: Remove "Branch" from synchronousCheckoutBranch

Browse Source 
Other refs can also be checked out using this function

Change-Id: I80a1c15244b1043cfce650a121c71174b9d322cb
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2013-01-24 11:32:45 +02:00
committed by Orgad Shaneh
parent a85c32cb4a
commit cf5f109b68
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/git/gitversioncontrol.cpp
View File

@@ -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.