Skip to content
Snippets Groups Projects
Commit 457b5e29 authored by Orgad Shaneh's avatar Orgad Shaneh Committed by Orgad Shaneh
Browse files

Git: Prevent double stash pop on branch checkout


when Move Local Changes is selected

Change-Id: I2c52e7fde56020370251c6eb93ed3f342fb8d9d8
Reviewed-by: default avatarTobias Hunger <tobias.hunger@digia.com>
Reviewed-by: default avatarPetar Perisin <petar.perisin@gmail.com>
parent d31efc22
No related branches found
No related tags found
No related merge requests found
......@@ -215,7 +215,7 @@ void BranchDialog::checkout()
}
if (!stashMessage.isEmpty() && branchCheckoutDialog.moveLocalChangesToNextBranch())
gitClient->stashPop(m_repository);
gitClient->endStashScope(m_repository);
else if (branchCheckoutDialog.popStashOfNextBranch())
gitClient->synchronousStashRestore(m_repository, stashName, true);
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment