Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:70022
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Received-SPF: pass (pb1.pair.com: domain oracle.com designates 141.146.126.69 as permitted sender)
Message-ID: <527982C6.2000308@oracle.com>
Date: Tue, 05 Nov 2013 15:44:06 -0800
User-Agent: Mozilla/5.0 (X11; Linux i686; rv:24.0) Gecko/20100101 Thunderbird/24.0.1
MIME-Version: 1.0
To: George Wang <gwang@litespeedtech.com>
CC: "internals@lists.php.net" <internals@lists.php.net>
References: <52796343.9020801@litespeedtech.com> <CADNQb0XEirAS+poUvAyhQyAEH_oQQLTae5NUWWichdrBNHz8GA@mail.gmail.com>
In-Reply-To: <CADNQb0XEirAS+poUvAyhQyAEH_oQQLTae5NUWWichdrBNHz8GA@mail.gmail.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Subject: Re: [PHP-DEV] cannot push to 5.x branches
From: christopher.jones@oracle.com (Christopher Jones)



On 11/05/2013 03:27 PM, Hannes Magnusson wrote:
> On Tue, Nov 5, 2013 at 1:29 PM, George Wang <gwang@litespeedtech.com> wrote:
>> Hi,
>>
>> I try to update sapi/litespeed code to the latest. Successfully pushed to
>> master branch:
>>
>> remote: Welcome gwang.
>> remote: Changesets accepted. Thank you for your contribution.
>> remote:
>> remote: Attempting to push to mirror git@github.com:php/php-src.git
>> remote: To git@github.com:php/php-src.git
>> remote:    c4cfdfa..3720fd7  master -> master
>> To git@git.php.net:php-src.git
>>     c4cfdfa..3720fd7  HEAD -> master
>>
>> but cannot push to 5.x branches. Got:
>>
>> remote: Welcome gwang.
>> remote: You have insufficient Karma!
>> remote: I'm sorry, I cannot allow you to write to
>> remote:     php-src.git/
>> remote: Have a nice day.
>> To git@git.php.net:php-src.git
>>   ! [remote rejected] HEAD -> 5.3 (pre-receive hook declined)
>> error: failed to push some refs to 'git@git.php.net:php-src.git'
>>
>> My .git/config:
>> [core]
>>          repositoryformatversion = 0
>>          filemode = true
>>          bare = false
>>          logallrefupdates = true
>> [remote "origin"]
>>          url = git@git.php.net:php-src.git
>>          fetch = +refs/heads/*:refs/remotes/origin/*
>>          pushurl = git@git.php.net:php-src.git
>> [branch "master"]
>>          remote = origin
>>          merge = refs/heads/master
>> [branch "5.3"]
>>          remote = origin
>>          merge = refs/heads/PHP-5.3
>> [branch "5.4"]
>>          remote = origin
>>          merge = refs/heads/PHP-5.4
>> [branch "5.5"]
>>          remote = origin
>>          merge = refs/heads/PHP-5.5
>>
>> Did I do anything wrong, or I just need more Karma?
>>
>
>
> You have karma for the litespeed sapi in php-src... master.
> We do have a good chunk of people that only have access to specific
> paths/extensions/sapis in php-src, I guess that doesn't work anymore
> since the move to git..
> I am unsure how the avail line should be to include branches, or how
> do modify the pre-receive hook to ignore branches when doing the path
> check.. David?
>
>
> -Hannes
>

PHP 5.3 is in security-fix only mode. If you have a security fix then
check with Johannes before merging.  Otherwise don't merge to that
branch.  Maybe access is restricted - I don't know?

PHP 5.4 is pretty stable, so I (personally) don't think a big change
would be desirable on that branch even for a specialized SAPI.  I'd
prefer to encourage people to move to PHP 5.5.

Chris

-- 
christopher.jones@oracle.com  http://twitter.com/ghrd
Free PHP & Oracle book:
http://www.oracle.com/technetwork/topics/php/underground-php-oracle-manual-098250.html