git: do not include merges in the commit range #16
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Vincent Batts <[email protected]>
|
passes |
|
I think what you're trying to do is avoid failing because of the
Travis-generated merge commit. A more reliable way to do that might
be using:
commitRange = fmt.Sprintf("%s..FETCH_HEAD^", os.Getenv("TRAVIS_BRANCH"))
for Travis testing.
I think human-generated merges in the commit range *should* be checked
against whatever criteria the caller is asking for, because
human-generated merge commits can still add novel code (and therefore
should have Signed-off-by), etc.
|
|
@wking if it works better, open a PR :-) |
wking
added a commit
to wking/git-validation
that referenced
this pull request
Mar 21, 2017
Partially reverting ca82522 (git: do not include merges in the commit range, 2017-03-21, vbatts#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 <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Signed-off-by: Vincent Batts [email protected]