diff options
| author | Jim Porter | 2023-04-23 11:43:07 -0700 |
|---|---|---|
| committer | Jim Porter | 2023-04-23 12:07:08 -0700 |
| commit | 3ce462c8fda02c29e79ec80fb389fc44d550142a (patch) | |
| tree | ddbfa1d0b863ce8e1372ba1cef3b851691b26399 /exec/exec.c | |
| parent | e26dcc0e1441ded286b83eefb358d965748dd6db (diff) | |
| download | emacs-3ce462c8fda02c29e79ec80fb389fc44d550142a.tar.gz emacs-3ce462c8fda02c29e79ec80fb389fc44d550142a.zip | |
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.
Diffstat (limited to 'exec/exec.c')
0 files changed, 0 insertions, 0 deletions