From 58584835925a48e0aca40d15204c001cb62037a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sun, 17 Dec 2017 21:08:20 +0100 Subject: NOISSUE ignore merge commits in dev build changelog --- application/dialogs/UpdateDialog.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'application/dialogs') diff --git a/application/dialogs/UpdateDialog.cpp b/application/dialogs/UpdateDialog.cpp index c935ec3b..30c7173d 100644 --- a/application/dialogs/UpdateDialog.cpp +++ b/application/dialogs/UpdateDialog.cpp @@ -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"); -- cgit v1.2.3