Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:68539
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Received-SPF: unknown (pb1.pair.com: domain php.net does not designate 85.214.73.107 as permitted sender)
Message-ID: <c6093f05625cf98894978d2bea4a8133.squirrel@webmail.klapt.com>
In-Reply-To: <1376592356.14536.240.camel@guybrush>
References: <1376589335.14536.228.camel@guybrush> <520D1BA8.1060504@seld.be>
    <1376592356.14536.240.camel@guybrush>
Date: Thu, 15 Aug 2013 21:30:27 +0200
To: =?UTF-8?Q?=22Johannes_Schl=C3=BCter=22?= <johannes@schlueters.de>
Cc: "Jordi Boggiano" <j.boggiano@seld.be>,
 internals@lists.php.net
Reply-To: "Anatol Belski" <ab@php.net>
User-Agent: SquirrelMail/1.5.2 [SVN]
MIME-Version: 1.0
Content-Type: text/plain;charset=UTF-8
Content-Transfer-Encoding: 8bit
Subject: Re: [PHP-DEV] git branches 5.3/ 5.4 / 5.5
From: ab@php.net ("Anatol Belski")

On Thu, August 15, 2013 20:45, Johannes Schlüter wrote:
> On Thu, 2013-08-15 at 20:19 +0200, Jordi Boggiano wrote:
>
>>
>> And to ensure you never push garbage by accident, run this to tell git
>> to always only push the branch you're on when you run `git push`:
>>
>> git config --global push.default current
>
> Good tip. I wasn't aware of that setting. Mind that we have multiple
> active branches we typically push to in one go, so using the default and
> being clear about ones tracking branches can be comfortable, too, and
> avoid forgetting to properly push to all branches.
>
> So each approach has benefits and downsides ... and well as I'm the only
> one who currently can do forced pushes (I think) neither approach will
> cause actual trouble ;-) (if it becomes bad, which I don't expect, we can
> add restrictions to the server, too)
>
>
> Probably the best is to do a push --dry-run to check and getting used to
> manually specify branches i.e. git push origin PHP-5.4 PHP-5.5 master
>
> johannes
>
>

Exactly, I usually do just 'git push origin' while being on master, so if
there's some stuff merged up from PHP-5.4 (or PHP-5.3 earlier), it
automatically goes with. The experimental branches will not be pushed with
this until one explicitly tells like 'git push origin my_experiment'.
Using that current setting would disable the automatic.

Anatol

Anatol