[llvm-dev] [cfe-dev] [Github] RFC: linear history vs merge commits (original) (raw)

David Greene via llvm-dev llvm-dev at lists.llvm.org
Thu Jan 31 09:29:27 PST 2019

Mehdi AMINI <joker.eph at gmail.com> writes:

What is the practical plan to enforce the lack of merges? When we looked into this GitHub would not support this unless also forcing every change to go through a pull request (i.e. no pre-receive hooks on direct push to master were possible). Did this change? Are we hoping to get support from GitHub on this?

We may write this rule in the developer guide, but I fear it'll be hard to enforce in practice.

Again, changes aren't going through git yet, right? Not until SVN is decommissioned late this year (or early next). SVN requires a strict linear history so it handles the enforcement for now.

My personal opinion is that when SVN is decomissioned we should use pull requests, simply because that's what's familiar to the very large development community outside LLVM. It will lower the bar to entry for new contributors. This has all sorts of implications we need to discuss of course, but we have some time to do that.

If we don't use PRs, then we're pretty much on the honor system to disallow merges AFAIK.

                         -David

More information about the llvm-dev mailing list