mc-in-work/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2026-07-04 04:16:57 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

NOISSUE ignore merge commits in dev build changelog

Browse source
This commit is contained in:
Petr Mrázek 2017-12-17 21:08:20 +01:00
parent 6fd91be137
commit 5858483592
1 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
application/dialogs/UpdateDialog.cpp
View file

@ -81,6 +81,12 @@ QString reprocessCommits(QByteArray json)
{
const auto & commitval = commitarray[i];
auto commitobj = Json::requireObject(commitval);
auto parents_info = Json::ensureArray(commitobj, "parents");
// NOTE: this ignores merge commits, because they have more than one parent
if(parents_info.size() > 1)
{
continue;
}
auto commit_url = Json::requireString(commitobj, "html_url");
auto commit_info = Json::requireObject(commitobj, "commit");
auto commit_message = Json::requireString(commit_info, "message");