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

Git: Fix popping of branch-stash after checkout

Browse Source 
Checking out a branch that has a saved stash, when
Pop branch stash is checked, is broken since checkout
became asynchronous.

We must wait for checkout to complete before popping
the branch stash.

Change-Id: Ia4d43649e742ced0121ffe106986b4d6ed1e7b38
Reviewed-by: André Hartmann <aha_1980@gmx.de>
This commit is contained in:
Orgad Shaneh
2019-06-26 16:15:12 +03:00
committed by Orgad Shaneh
parent 0d7f33aa71
commit a1ba347fa5
5 changed files with 34 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/git/gitclient.h
View File

@@ -174,8 +174,8 @@ public:
QString revision = QString(), QString *errorMessage = nullptr,
bool revertStaging = true);
enum class StashMode { NoStash, TryStash };
void checkout(const QString &workingDirectory, const QString &ref,
StashMode stashMode = StashMode::TryStash);
VcsBase::VcsCommand *checkout(const QString &workingDirectory, const QString &ref,
StashMode stashMode = StashMode::TryStash);
QStringList setupCheckoutArguments(const QString &workingDirectory, const QString &ref);
void updateSubmodulesIfNeeded(const QString &workingDirectory, bool prompt);