]> git.eshelyaron.com Git - emacs.git/commit
When examining merge commits in our Git hooks, only check the first parent
authorJim Porter <jporterbugs@gmail.com>
Sun, 23 Apr 2023 18:43:07 +0000 (11:43 -0700)
committerJim Porter <jporterbugs@gmail.com>
Sun, 23 Apr 2023 19:07:08 +0000 (12:07 -0700)
commit3ce462c8fda02c29e79ec80fb389fc44d550142a
treeddbfa1d0b863ce8e1372ba1cef3b851691b26399
parente26dcc0e1441ded286b83eefb358d965748dd6db
When examining merge commits in our Git hooks, only check the first parent

This does two things:

  1. We can properly validate log entries in merge commits.
  2. We don't check commits that were merged in from other branches.

* build-aux/git-hooks/commit-msg-files.awk (get_commit_changes): Get
the changes compared to the first parent.

* build-aux/git-hooks/pre-push: Only get the first parent of merge
commits when returning the rev-list, and only check "master" or
"emacs-NN" branches.
build-aux/git-hooks/commit-msg-files.awk
build-aux/git-hooks/pre-push