Uploaded image for project: 'phpBB'
  1. phpBB
  2. PHPBB-10765

commit-msg hooks complains on merge commits

XMLWordPrintable

    • Icon: Bug Bug
    • Resolution: Won't Fix
    • Icon: Minor Minor
    • 3.0.15-RC1
    • 3.0.10
    • None
    • None

      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.

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

              Created:
              Updated:
              Resolved: