Uploaded image for project: 'phpBB3'
  1. phpBB3
  2. PHPBB3-10765

commit-msg hooks complains on merge commits

    Details

    • Type: Bug
    • Status: Closed (View Workflow)
    • Priority: Minor
    • Resolution: Won't Fix
    • Affects Version/s: 3.0.10
    • Fix Version/s: 3.0.15-RC1
    • Component/s: None
    • Labels:
      None

      Description

      I encountered this when fixing conflicts in a develop-olympus -> develop merge and committing with git ci.

      Warning: heading should be a sentence beginning with a capital letter.
      You entered:
      Merge branch 'develop-olympus' into develop
      Syntax error on line 1:
      >> Merge branch 'develop-olympus' into develop
      Expecting: comment, header,
      [develop 7d6b289] Merge branch 'develop-olympus' into develop

      We should detect if a commit being made is a merge commit (>1 parent?) and skip the checks in that case.

        Attachments

          Activity

            People

            • Assignee:
              CHItA CHItA
              Reporter:
              Oleg Oleg [X] (Inactive)
            • Votes:
              0 Vote for this issue
              Watchers:
              0 Start watching this issue

              Dates

              • Created:
                Updated:
                Resolved: