diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2023-02-22 11:28:08 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2023-02-22 11:28:08 +0100 |
| commit | ddbf8a4ffb0f3f9887cf44fa1b2f13a58c2d467c (patch) | |
| tree | c6d3f1cd6f1655b84e611102e1fe1d149b1aa51c /src/plugins/git | |
| parent | 5b6ef231ba94c3fe0dbe0fdbb80c12855fcd0c57 (diff) | |
| parent | 27760c38c64cc2def780d849dc372f5cc28dee33 (diff) | |
| download | qt-creator-ddbf8a4ffb0f3f9887cf44fa1b2f13a58c2d467c.tar.gz | |
Merge remote-tracking branch 'origin/10.0'
Change-Id: I8a53e2e8216fab7e45c3a1b8a3d2dc6656dfa7e2
Diffstat (limited to 'src/plugins/git')
| -rw-r--r-- | src/plugins/git/gitplugin.cpp | 3 |
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); |