summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2017-12-17 21:08:20 +0100
committerPetr Mrázek <peterix@gmail.com>2017-12-17 21:08:20 +0100
commit58584835925a48e0aca40d15204c001cb62037a8 (patch)
tree2a17383d540deaf31b12ca30b38813554551a507
parent6fd91be13717d1175491eb892dad7e8e4bea23b0 (diff)
downloadMultiMC-58584835925a48e0aca40d15204c001cb62037a8.tar
MultiMC-58584835925a48e0aca40d15204c001cb62037a8.tar.gz
MultiMC-58584835925a48e0aca40d15204c001cb62037a8.tar.lz
MultiMC-58584835925a48e0aca40d15204c001cb62037a8.tar.xz
MultiMC-58584835925a48e0aca40d15204c001cb62037a8.zip
NOISSUE ignore merge commits in dev build changelog
-rw-r--r--application/dialogs/UpdateDialog.cpp6
1 files changed, 6 insertions, 0 deletions
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");