I don't believe Apache will allow us a custom pre-commit hok.
On Fri, Apr 24, 2015 at 5:50 PM, Jesse Yates <[email protected]> wrote: > I think we need control of the git server and I don't know if apache will > let us have the pre-commit-hooks installed. I don't think its worth it... > as long as we are careful. they aren't the end of the world :) > > On Fri, Apr 24, 2015 at 5:47 PM Nick Dimiduk <[email protected]> wrote: > > > That's how it usually goes :) > > > > That's why I'm asking about automation for this kind of thing. In theory > > the server can just reject the push, but I don't know the git-foo. > > > > On Friday, April 24, 2015, Cody Marcel <[email protected]> wrote: > > > > > Sorry Nick. I call gitnorance on myself for this one :). I did do a > fetch > > > and rebase before applying my patch. What got me was commits happened > > > before I could commit. Then I did a pull without realizing that would > > > merge. Sorry about that. > > > > > > ~Cody > > > > > > On Fri, Apr 24, 2015 at 5:02 PM, Nick Dimiduk <[email protected] > > > <javascript:;>> wrote: > > > > > > > Seems it's happened again since the mail went out. This seems like a > > > silly > > > > thing to try to enforce by policy when it could be done through > > > automation. > > > > Andrew, do you know if there's a way to have upstream reject pushes > > that > > > > include merge commits where all parents are from the same branch? > > > > > > > > Thanks, > > > > Nick > > > > > > > > On Fri, Apr 24, 2015 at 3:59 PM, Andrew Purtell <[email protected] > > > <javascript:;>> > > > > wrote: > > > > > > > > > +1 > > > > > > > > > > On Wed, Apr 22, 2015 at 3:29 PM, Nick Dimiduk <[email protected] > > > <javascript:;>> > > > > wrote: > > > > > > > > > > > Hi folks, > > > > > > > > > > > > Looks like a merge commit was recently pushed to master. I think > we > > > > have > > > > > > the project policy to not merge changes, but rather rebase any > > local > > > > > > changes onto an update from upstream. > > > > > > > > > > > > The easiest way to avoid merge commits is to not use `git pull` > but > > > > > instead > > > > > > use `get fetch` followed by `rebase`. If you prefer to use just a > > > > single > > > > > > command, `git pull --rebase` will do the trick. More options are > > > > > available > > > > > > here [0]. > > > > > > > > > > > > Thanks, > > > > > > Nick > > > > > > > > > > > > [0]: > > > > > > > > > > > > > > > > > > > > > http://kernowsoul.com/blog/2012/06/20/4-ways-to-avoid-merge-commits-in-git/ > > > > > > > > > > > > > > > > > > > > > > > > > > -- > > > > > Best regards, > > > > > > > > > > - Andy > > > > > > > > > > Problems worthy of attack prove their worth by hitting back. - Piet > > > Hein > > > > > (via Tom White) > > > > > > > > > > > > > > > -- Best regards, - Andy Problems worthy of attack prove their worth by hitting back. - Piet Hein (via Tom White)
