deac/gitolite
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

minor fixup to previous commit documenting merge-check

Browse source 
thanks to Heiko Carstens for convincing me there are valid workflows
that need this feature (forgot to put this in the earlier commit)
This commit is contained in:
Sitaram Chamarty 2012-01-17 04:18:52 +05:30
parent fdfad75210
commit 7744143f6c
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
doc/gitolite.conf.mkd
View file

@ -440,9 +440,10 @@ Some usage hints:
### #mergecheck enforcing a no-merges policy ### #mergecheck enforcing a no-merges policy
Some people want to enforce a no-merges policy for various reasons. This can Some people want to enforce a no-merges policy for various reasons. This
be done by suffixing an "M" to the permissions, so for instance, `RW` becomes behaviour can be enabled by suffixing an "M" to the end of any permission
`RWM`, and `RW+` becomes `RW+M`. starting with `RW` (i.e., all of them except `R`). So for instance, `RW`
becomes `RWM`, and `RW+` becomes `RW+M`, etc.
The rules are exactly the same as for "C" and "D": once a repo has an "M" The rules are exactly the same as for "C" and "D": once a repo has an "M"
qualifier tied to any access rule, all rules for that repo are subject to qualifier tied to any access rule, all rules for that repo are subject to
@ -451,11 +452,12 @@ merge checking, and merge commits will only be allowed when the rule has the
## summary: permissions ## summary: permissions
The full set of permissions, in regex syntax: `-|R|RW+?C?D?`. This expands to The full set of permissions, in regex syntax: `-|R|RW+?C?D?M?`. This expands
one of `-`, `R`, `RW`, `RW+`, `RWC`, `RW+C`, `RWD`, `RW+D`, `RWCD`, or to one of `-`, `R`, `RW`, `RW+`, `RWC`, `RW+C`, `RWD`, `RW+D`, `RWCD`, or
`RW+CD`. and by now you know what they all mean. `RW+CD`, all but the first one optionally followed by an `M`. And by now you
know what they all mean.
[Side note: There is one more very important permissions to be dealt with -- [Side note: There is one more very important permission to be dealt with --
the standalone `C`, which is not really a "ref" level permission and can be the standalone `C`, which is not really a "ref" level permission and can be
found in doc/wildcard-repositories.mkd.] found in doc/wildcard-repositories.mkd.]