Can you show on Tim's repo how that won't work? Cheers, Renato On 20 Jul 2016 12:59 a.m., "Mehdi Amini" <mehdi.amini at apple.com> wrote:> > On Jul 19, 2016, at 4:44 PM, Renato Golin via llvm-dev < > llvm-dev at lists.llvm.org> wrote: > > That is what I'm proposing, and Tim is helping us test. We should reach a > solution quickly, and once we do, I'll update the document. > > > Protected branch *alone* don’t enforce a linear history without the > "status checks” feature. I don’t believe Chandler is proposing to use > "status checks”, and he is concerned with “rewriting the history” more than > enforcing a linear history, so you’ll have to be careful about what is the > promise exactly. > > — > Mehdi > > > Feel free to try his repo, I'll only try tomorrow. If you guys come up > with a clear flow before that, let me know. > > Cheers, > Renato > > On 20 Jul 2016 12:36 a.m., "Chandler Carruth" <chandlerc at google.com> > wrote: > >> I've not read all of the github threads, so sorry if this has been >> brought up, but... >> >> On Tue, Jul 19, 2016 at 1:27 PM Renato Golin via llvm-dev < >> llvm-dev at lists.llvm.org> wrote: >> >>> 1. Pre-commit hooks, avoiding forced pushes / re-order >>> >>> GitHub doesn't support server hooks due to security concerns. >>> >> >> GitHub does support protected branches which prevent forced pushes. I've >> even played with them in the llvm GitHub project and they work as expected. >> It should give the exact workflow that I think LLVM devs are used to with >> Subversion of post-commit review. >> >> -Chandler >> > _______________________________________________ > LLVM Developers mailing list > llvm-dev at lists.llvm.org > http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev > > >-------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.llvm.org/pipermail/llvm-dev/attachments/20160720/12bfd1f0/attachment.html>
Tim’s repo is using "status checks” and not only protected branch.> On Jul 19, 2016, at 5:01 PM, Renato Golin <renato.golin at linaro.org> wrote: > > Can you show on Tim's repo how that won't work? > > Cheers, > Renato > > > On 20 Jul 2016 12:59 a.m., "Mehdi Amini" <mehdi.amini at apple.com <mailto:mehdi.amini at apple.com>> wrote: > >> On Jul 19, 2016, at 4:44 PM, Renato Golin via llvm-dev <llvm-dev at lists.llvm.org <mailto:llvm-dev at lists.llvm.org>> wrote: >> >> That is what I'm proposing, and Tim is helping us test. We should reach a solution quickly, and once we do, I'll update the document. >> > > Protected branch *alone* don’t enforce a linear history without the "status checks” feature. I don’t believe Chandler is proposing to use "status checks”, and he is concerned with “rewriting the history” more than enforcing a linear history, so you’ll have to be careful about what is the promise exactly. > > — > Mehdi > > >> Feel free to try his repo, I'll only try tomorrow. If you guys come up with a clear flow before that, let me know. >> >> Cheers, >> Renato >> >> >> On 20 Jul 2016 12:36 a.m., "Chandler Carruth" <chandlerc at google.com <mailto:chandlerc at google.com>> wrote: >> I've not read all of the github threads, so sorry if this has been brought up, but... >> >> On Tue, Jul 19, 2016 at 1:27 PM Renato Golin via llvm-dev <llvm-dev at lists.llvm.org <mailto:llvm-dev at lists.llvm.org>> wrote: >> 1. Pre-commit hooks, avoiding forced pushes / re-order >> >> GitHub doesn't support server hooks due to security concerns. >> >> GitHub does support protected branches which prevent forced pushes. I've even played with them in the llvm GitHub project and they work as expected. It should give the exact workflow that I think LLVM devs are used to with Subversion of post-commit review. >> >> -Chandler >> _______________________________________________ >> LLVM Developers mailing list >> llvm-dev at lists.llvm.org <mailto:llvm-dev at lists.llvm.org> >> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev <http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev> >-------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.llvm.org/pipermail/llvm-dev/attachments/20160719/f2ed97f9/attachment.html>
On 19 July 2016 at 17:10, Mehdi Amini via llvm-dev <llvm-dev at lists.llvm.org> wrote:> Tim’s repo is using "status checks” and not only protected branch.Yep, I think the main benefit (so far) over just protected branches would be that we can also guarantee sane timestamps on master, which should mean we can reconstruct the llvm-project umbrella uniquely when its script goes down or something else weird happens. I think that's a useful ability to have, and can't really think of a way to do it if you can't trust a commit's time (commit-date here, not author-date). I'm not sure how theoretical that issue is though. It would also alter the usual git workflow, which is unfortunate. You'd have to explicitly run "git llvm-verify" before pushing to master (or "git llvm-push", or whatever). Tim.