[PATCH] D67262: [git-llvm] Do not reinvent `@{upstream}`

[David Zarzycki via Phabricator via llvm-commits]

davezarzycki added a comment.

In D67262#1665661 <https://reviews.llvm.org/D67262#1665661>, @mehdi_amini wrote:

> > I don't know what the long-term plans for this script are.
>
> The only way for us to enforce linear history on GitHub at the moment is to mandate the use of the script unfortunately.


Food for thought:

1. git-llvm is run client side, so the linear history check isn't technically "enforced".
2. with SVN, nothing stopped people from merging into master other than social norms and the world didn't end.
3. why not just trust people after a few months to not do merge commits and then warn/punish people that do? Then git-llvm can go away.
4. alternatively, one could just have a frequently run script force update `master` to the last pre-merge commit and send out an automated and angrily worded email.
5. nag/beg GitHub to make merge commits optionally require project administrator privileges. I'd hope for a high-profile project like LLVM, they would consider it.


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D67262/new/

https://reviews.llvm.org/D67262