From 933fd512253ee6c52063ea32aecf7543f3de1b89 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh <orgad.shaneh@audiocodes.com> Date: Sun, 20 Jul 2014 17:37:54 +0300 Subject: [PATCH] Git: Fix soft assertion on Abort Rebase When a rebase was initialized in a previous session or by command-line. Change-Id: I1a185f1bf1a9caeeba0d8358debc855cbd926d48 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> --- src/plugins/git/gitclient.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index f0709cecf8f..f5d1c628fc9 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -2231,7 +2231,8 @@ GitClient::StashInfo &GitClient::stashInfo(const QString &workingDirectory) void GitClient::endStashScope(const QString &workingDirectory) { const QString repoDirectory = VcsManager::findTopLevelForDirectory(workingDirectory); - QTC_ASSERT(m_stashInfo.contains(repoDirectory), return); + if (!m_stashInfo.contains(repoDirectory)) + return; m_stashInfo[repoDirectory].end(); } -- GitLab