[Xfce4-commits] <moka:master> Allow fast-forward on repos.

[Nick Schermer]

Updating branch refs/heads/master
         to 8b985ac8ad941f5917590a51d7ed8a673a131fe5 (commit)
       from 845fc27cd2cefb732d4134a6c096da345e3a8700 (commit)

commit 8b985ac8ad941f5917590a51d7ed8a673a131fe5
Author: Nick Schermer <nick at xfce.org>
Date:   Tue Dec 20 14:58:37 2011 +0100

    Allow fast-forward on repos.
    
    This allows removing branches again.
    
    The "receive.denyNonFastforwards = true" will forbid ff commits,
    and the hooks have a rule to avoid removing tags and special branches.

 lib/helpers/gitolite.rb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/helpers/gitolite.rb b/lib/helpers/gitolite.rb
index 8eed060..07126c6 100644
--- a/lib/helpers/gitolite.rb
+++ b/lib/helpers/gitolite.rb
@@ -49,11 +49,11 @@ module Moka
 
           # basic permissions
           conf << "repo " + classification.name + "/" + name + "\n"
-          conf << "\tRW = @repo-admin"
+          conf << "\tRW+ = @repo-admin"
 
           # add maintainers
           maintainers = projects[name]
-          conf << "\n\tRW = " + maintainers.sort.join(" ") if maintainers
+          conf << "\n\tRW+ = " + maintainers.sort.join(" ") if maintainers
 
           # let gitolite create git-daemon-export-ok
           conf << "\n\tR = daemon @all" if project.groups.include?(public)