[sane-devel] Proposal to disallow direct pushes to the master branch
povilas at radix.lt
Thu Oct 24 18:23:15 BST 2019
On 10/21/19 1:25 AM, Olaf Meeuwissen wrote:
>> What do you think about this?
> So while I certainly agree that using GitLab merge requests is a good
> idea (and should be encouraged), I am not completely convinced that it
> should be made the *only* way to push code changes.
> I still think that a *single* commit for which you'd normally want to
> skip CI is OK to push directly to master. I say "normally" because
> changes to any of the *.desc files should trigger CI so that the list
> of supported devices by the master branch gets updated on the website
> in a timely fashion.
> # BTW, you can add [ci skip] or [skip ci] marker to your commit message
> # to prevent triggering a build.
> However, any sequence of related commits had best go via a GitLab merge
> request (or local branch with a --no-ff commit to master). Just pushing
> that sequence out onto master (as would happen when you develop directly
> on master or push a local fast-forwarded merge!) is something that is
> probably better avoided for the reasons discussed above.
I think I completely agree with you. While I support requiring merge
requests even for single-commit changes, allowing pushing them directly
to master would be a reasonable compromise.
> Hope this helps,
> Olaf Meeuwissen, LPIC-2 FSF Associate Member since 2004-01-27
> GnuPG key: F84A2DD9/B3C0 2F47 EA19 64F4 9F13 F43E B8A4 A88A F84A 2DD9
> Support Free Software https://my.fsf.org/donate
> Join the Free Software Foundation https://my.fsf.org/join
More information about the sane-devel