1
0
Fork 0
mirror of https://github.com/vbatts/git-validation.git synced 2024-12-27 16:06:30 +00:00
git-validation/git
W. Trevor King a5aad5a99b git/commits: Test merge commits
Partially reverting ca825225 (git: do not include merges in the commit
range, 2017-03-21, #16).  I've kept the unrelated --no-pager addition
from that commit.

I think merges in the commit range should be checked against whatever
criteria the caller is asking for.  If the caller does not want to
check a machine-generated commit, they shouldn't include it in the
commit range.

And we already have special-cases for merges.  For example, we skip
DCO checks for merge commits.  I'd be happier without that special
case, because human-generated merge commits can still add novel code
(and therefore should have Signed-off-by), etc.  But I don't think we
want a blanket pass for merge commits.

Signed-off-by: W. Trevor King <wking@tremily.us>
2017-03-21 11:35:00 -07:00
..
testdata git: restructured commit entries 2016-04-05 15:28:38 -04:00
commits.go git/commits: Test merge commits 2017-03-21 11:35:00 -07:00
commits_test.go git: restructured commit entries 2016-04-05 15:28:38 -04:00