Flaw in our process for dealing with trivial changes
matt at openssl.org
Thu Dec 12 12:10:35 UTC 2019
On 12/12/2019 12:06, Dr. Matthias St. Pierre wrote:
>>> The server-side commit hook ensures that
>>> - the "CLA: trivial" annotation is present in *all* commits of the PR if and only if the [cla: trivial]
>>> label is set.
>>> - the [cla: ok] label is set if and only if the CLA is on file
>>> - the pull request is accepted only if the [cla: ok] or [cla: trivial] label is set
>> One issue with this bit is that it requires the git hooks to connect to
>> github to check the labels. AFAIK we don't do that at present. Does it
>> add too much complexity to the hooks?
> Actually, the consistency checks could be done entirely by the addrev script, which already uses the GitHub API.
> Ensure that
> - the [cla: ok] label is set if and only if the CLA is on file
> - the [cla: trivial] label is set if and only if the "CLA: trivial" annotation is present in *all* commits of the PR
It's conceivable (although I don't know how likely) that a PR has mixed
commits from different authors. E.g. a complex PR from one author with a
CLA on file, but with one commit from a different author that is trivial.
But in principle I agree that addrev could be used to do this. It's not
quite as robust as doing it in the commit hook - because you don't
*have* to use addrev. But, AFAIK, everyone does - so that's probably
> git commit hook
> Accept pull request if and only if the CLA is on file or *all* commits have the "CLA: trivial" annotation.
> (The git commit hook would need only a minimal change, if it does not check *all* commits yet.)
More information about the openssl-project