Uploaded image for project: 'Qt Quality Assurance Infrastructure'
  1. Qt Quality Assurance Infrastructure
  2. QTQAINFRA-3636

Gerrit creates duplicate merge commits

XMLWordPrintable

    • Icon: Bug Bug
    • Resolution: Fixed
    • Icon: Not Evaluated Not Evaluated
    • None
    • None
    • Gerrit
    • None

      According to git history, approved commits are now creating also merge commits: 

      (tqtc-coin-ci) 11:25:57~/tqtc-coin-ci {master} $ git log origin/master -3 --format=fuller
      commit 75d745f6a074b53fe69b35a359f3b484cd5a71d1 (origin/master, origin/HEAD)
      Merge: 16538ba1 35bc109a
      Author: Matti Paaso <matti.paaso@qt.io>
      AuthorDate: Tue Mar 31 07:16:01 2020 +0300
      Commit: Qt CI Bot <qt_ci_bot@qt-project.org>
      CommitDate: Mon Apr 6 04:18:23 2020 +0000
      Merge "Optimize test artifacts creation"
      commit 35bc109a788af5043dfae98c80db687c1c30b01d
      Author: Matti Paaso <matti.paaso@qt.io>
      AuthorDate: Tue Mar 31 07:16:01 2020 +0300
      Commit: Matti Paaso <matti.paaso@qt.io>
      CommitDate: Mon Apr 6 07:07:04 2020 +0300
      Optimize test artifacts creation
       
       Try to reduce time to create test artifacts
       
       Change-Id: I759dc747b317624a706e028108d446b550baefd8
       Reviewed-by: Toni Saario <toni.saario@qt.io>
      commit 16538ba1eb0096acc1a6e515fcd73c7ff8eb65bb
      Merge: 14b1d840 80619430
      Author: Toni Saario <toni.saario@qt.io>
      AuthorDate: Thu Apr 2 11:41:48 2020 +0300
      Commit: Qt CI Bot <qt_ci_bot@qt-project.org>
      CommitDate: Thu Apr 2 10:52:52 2020 +0000
      Merge "Handle 5 opennebula xmlrpc return values"
      

      Previously the commits were cherry-picked which means that there was no additional merge commit. This seems to have changed now for some reason. 

        No reviews matched the request. Check your Options in the drop-down menu of this sections header.

            jujokini Jukka Jokiniva
            aakeskimo Aapo Keskimölö
            Votes:
            0 Vote for this issue
            Watchers:
            2 Start watching this issue

              Created:
              Updated:
              Resolved:

                There are no open Gerrit changes