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

Allow some exceptions to the rule that empty commits cannot be staged

XMLWordPrintable

    • Icon: Task Task
    • Resolution: Fixed
    • Icon: P1: Critical P1: Critical
    • None
    • None
    • Gerrit
    • None
    • a941ffb34 (v3.10-based)

      The workflow plugin blocks staging of empty commits to act as a safeguard against double-merging of changes which would create a second, empty patchset.

      Implementation of this new rule overlooked the use case where a [ChangeLog] tag in a commit message is used to update changelog generation, without touching any code in the same commit. This technically counts as an empty commit since no files are touched.

      We can keep the new blocking behavior if we also implement an exception system.

      Proposed fix: Use the internal gerrit user's git config at ~/.gitconfig to read from a new section `qtcodereview`, and a new key in that subsection `emptyCommitExceptions` to define a comma-separated list of whitelisted commit-message search values which cause the plugin to bypass the empty-commit check.

        For Gerrit Dashboard: QTQAINFRA-7343
        # Subject Branch Project Status CR V

            daniel.smith Daniel Smith
            daniel.smith Daniel Smith
            Votes:
            0 Vote for this issue
            Watchers:
            2 Start watching this issue

              Created:
              Updated:
              Resolved:

                There are no open Gerrit changes