[RTEMS Project] #3872: Add hook to stop merge commits into the master repository

[RTEMS trac]

#3872: Add hook to stop merge commits into the master repository
-------------------------+-----------------------
 Reporter:  Amar Takhar  |       Owner:  (none)
     Type:  infra        |      Status:  assigned
 Priority:  normal       |   Milestone:
Component:  admin        |     Version:
 Severity:  normal       |  Resolution:
 Keywords:  git, server  |  Blocked By:
 Blocking:               |
-------------------------+-----------------------
Description changed by Amar Takhar:

Old description:

> A developer had an issue where they accidentally pushed local code that
> generated a 'merge commit'.
>
> It's been suggested a hook be added to the server side repository to stop
> this from happening.
>
> Here is one such hook I'll have to test it out before adding it:
>
>   https://stackoverflow.com/questions/2039773/have-remote-git-repository-
> refuse-merge-commits-on-push

New description:

 A developer had an issue where they accidentally pushed local code that
 generated a 'merge commit'.

 It's been suggested a hook be added to the server side repository to stop
 this from happening.

 Here is one such hook I'll have to test it out before adding it:

   https://stackoverflow.com/questions/2039773/have-remote-git-repository-
 refuse-merge-commits-on-push

 I will also add:
 {{{
 [receive]
     denyNonFastForwards = true
     denyDeletes = true
 }}}

 To the main repo to block any accidental {{{--force}}} pushes.  If we are
 blocking merge commits it makes sense to block this as well.

--

--
Ticket URL: <http://devel.rtems.org/ticket/3872#comment:1>
RTEMS Project <http://www.rtems.org/>
RTEMS Project