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

Git: Fix soft assertion on Abort Rebase

Browse Source 
When a rebase was initialized in a previous session or by
command-line.

Change-Id: I1a185f1bf1a9caeeba0d8358debc855cbd926d48
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2014-07-20 17:37:54 +03:00
committed by Orgad Shaneh
parent 9f37bb131e
commit 933fd51225
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/git/gitclient.cpp
View File

@@ -2231,7 +2231,8 @@ GitClient::StashInfo &GitClient::stashInfo(const QString &workingDirectory)
void GitClient::endStashScope(const QString &workingDirectory) void GitClient::endStashScope(const QString &workingDirectory)
{ {
const QString repoDirectory = VcsManager::findTopLevelForDirectory(workingDirectory); const QString repoDirectory = VcsManager::findTopLevelForDirectory(workingDirectory);
QTC_ASSERT(m_stashInfo.contains(repoDirectory), return); if (!m_stashInfo.contains(repoDirectory))
return;
m_stashInfo[repoDirectory].end(); m_stashInfo[repoDirectory].end();
} }