Attachment 571877 Details for Bug 798051 – dont overwrite single repo configs with @repogroups identical configs

[patch] dont overwrite single repo configs with @repogroups identical configs

gitolite-2.0.3-repogroup-config-dont-overwrite-single-repo-config.patch (text/plain), 1007 bytes, created by Fabrice Bellet on 2012-03-21 22:00:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Fabrice Bellet

Created: 2012-03-21 22:00:01 UTC

Size: 1007 bytes

patch

obsolete

>--- sitaramc-gitolite-4c1e4b2/src/gitolite.pm.orig	2012-02-27 21:59:09.699580170 +0100
>+++ sitaramc-gitolite-4c1e4b2/src/gitolite.pm	2012-02-27 21:59:28.802476445 +0100
>@@ -650,7 +650,10 @@
>         $repos{$dr}{DELETE_IS_D} = 1 if $repos{$r}{DELETE_IS_D};
>         $repos{$dr}{CREATE_IS_C} = 1 if $repos{$r}{CREATE_IS_C};
>         $repos{$dr}{NAME_LIMITS} = 1 if $repos{$r}{NAME_LIMITS};
>-        $git_configs{$dr} = $git_configs{$r} if $git_configs{$r};
>+        # this needs to copy the key-value pairs from RHS to LHS, not just
>+        # assign RHS to LHS!  However, we want to roll in '@all' configs also
>+        # into the actual $repo; there's no need to preserve the distinction
>+        map { $git_configs{$repo}{$_} = $git_configs{$r}{$_} if not $git_configs{$repo}{$_} } keys %{$git_configs{$r}} if $git_configs{$r};
> 
>         for my $u ('@all', "$gl_user - wild", @user_plus, keys %perm_cats) {
>             my $du = $gl_user; $du = '@all' if $u eq '@all' or ($perm_cats{$u} || '') eq '@all';

Actions: View | Diff

Attachments on bug 798051: 571876 | 571877