summaryrefslogtreecommitdiff
path: root/src/plugins/git/gitplugin.cpp
diff options
context:
space:
mode:
authorAndre Hartmann <aha_1980@gmx.de>2023-02-19 15:41:55 +0100
committerAndré Hartmann <aha_1980@gmx.de>2023-02-19 14:56:14 +0000
commitb9af26adf3c0f7d5b923760581fc1942ff965e3e (patch)
tree84a0c0d7744c94ed9ad6805f9c2b08e668599b32 /src/plugins/git/gitplugin.cpp
parent10dc4f93f432ca066a02de98470536cc10a917b3 (diff)
downloadqt-creator-b9af26adf3c0f7d5b923760581fc1942ff965e3e.tar.gz
Git: Fix soft asserts on failing instant blame
When git blame returns no output, silently avoid creating annotations instead flooding soft asserts. This situation can easily happen when navigating to a header file that is not under version control. Fixes: QTCREATORBUG-28768 Change-Id: I8d2f443dec98575221995a9016bd2f8442c682cf Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/git/gitplugin.cpp')
-rw-r--r--src/plugins/git/gitplugin.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp
index 25c7febadb..9729dbe424 100644
--- a/src/plugins/git/gitplugin.cpp
+++ b/src/plugins/git/gitplugin.cpp
@@ -1502,7 +1502,8 @@ CommitInfo parseBlameOutput(const QStringList &blame, const Utils::FilePath &fil
const Git::Internal::Author &author)
{
CommitInfo result;
- QTC_ASSERT(blame.size() > 12, return result);
+ if (blame.size() <= 12)
+ return result;
result.sha1 = blame.at(0).left(40);
result.author = blame.at(1).mid(7);