fix 'C' and 'M' tests in 'gitolite access'...

C was being handled incorrectly, while M was not even considered (and
would behave as if MERGE_CHECK was set)

thanks to Björn Kautler

1 files changed, 2 insertions, 1 deletions

diff --git a/src/commands/access b/src/commands/access
index f02e533..8e85966 100755
--- a/src/commands/access
+++ b/src/commands/access
@@ -85,8 +85,9 @@ while (<>) {
 
 sub adjust_aa {
     my ($repo, $aa) = @_;
-    $aa = '+' if $aa eq 'C' and not option($repo, 'CREATE_IS_C');
+    $aa = 'W' if $aa eq 'C' and not option($repo, 'CREATE_IS_C');
     $aa = '+' if $aa eq 'D' and not option($repo, 'DELETE_IS_D');
+    $aa = 'W' if $aa eq 'M' and not option($repo, 'MERGE_CHECK');
     return $aa;
 }