[PHP-DEV] php-src is now on git

Re: [PHP-DEV] php-src is now on git

David Soria Parra — Tue, 20 Mar 2012 23:20:02 +0100

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 03/20/2012 09:48 PM, Ángel González wrote:
> El 19/03/12 21:29, David Soria Parra escribió:
>> On 2012-03-19, Kris Craig wrote:
>>> The workflow page currently recommends the "git:" one for
>>> cloning (which doesn't work for me, either).
>> git:// is recommended when you can use it. The access is limited
>> due to port limiations, but the protocl itself is superior to
>> https for the purpose.
>>
>> http is a fallback when you cannot use ssh (developers only) or
>> git
> Actually, the provided url is wrong. It lists
> http://git.php.net/repository/php-src.git but that returns "ERR
> access denied or repository not exported: /repository/php-src.git"
> (that's an error given by the server)

http://git.php.net/repository/php-src.git
works for me
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQIcBAEBAgAGBQJPaOxkAAoJEAT0aMuPE7Z1IUgP/imd9FqddUiAJcYnxjCFZB2T
E+U0lkIy0w6zX0nVwgFsls47ON28tcQjblVmkwotpij+1IR70UuilOrjI3aaHHSx
B0SyGUFMT7zoGAbs98tvwE2v26bYNd9fR15usZpLmnvyKoCZTXdJk8HRoyGpDQYm
D3SsnPF1P11tyHPWcs5jVpemTbGY6EnGTRJbZbCZmSBTEwB9+DB+6BzXRHu8tNx2
nNfVlinnRvbw+VTvKbeYj3eThGmXCyztWyKNpnUW+oSS7CSA6uKaFUpDFZiaWgnd
9bGOe4evkKms8z3rJdE+mnoasTwxcTpT4XvaayEYShateKhozTWxQBE0ix7BuaMI
WGkCuPhnko2fyTmhq5uxdpJL8/oxF8CejNcNCXGmi+8B1slIOXuk9owdI78g085f
pGd6BSbjXfrhJnxAGLMwifY+aTVOSyr+nnlzuUIhJDsEWX5s77O4DQ1NmwJ7rDEU
e1z0DbiL1enExipFi81H0r58J+05wPmbj4qIgZXstMhl/2qCoeCz9ZQ0z33QdEpC
5WGhShJjuiHWk7Vo/1oG1xObZ9qLefRPo7qq1D7eR7GmiCFKesCQX/VQtExkbtAR
W3fOVPeoZMbaqW280iVqQsaeuV1TsQmkCG9WyjrnoL7kwGvPMr5T4hYYL4PGep8d
Nd0JVzBlHgIINffgOc4p
=0Uto
-----END PGP SIGNATURE-----

--
PHP Internals - PHP Runtime Development Mailing List
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-DEV] php-src is now on git

Ángel González — Tue, 20 Mar 2012 23:20:02 +0100

El 19/03/12 21:29, David Soria Parra escribió:
> On 2012-03-19, Kris Craig wrote:
>> The workflow page currently recommends the "git:" one for cloning (which
>> doesn't work for me, either).
> git:// is recommended when you can use it. The access is limited due to
> port limiations, but the protocl itself is superior to https for
> the purpose.
>
> http is a fallback when you cannot use ssh (developers only) or git
Actually, the provided url is wrong.
It lists http://git.php.net/repository/php-src.git but that returns
"ERR access denied or repository not exported: /repository/php-src.git"
(that's an error given by the server)

If you remove "repository" from the path and use just
git://git.php.net/php-src.git it works :)

--
PHP Internals - PHP Runtime Development Mailing List
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-DEV] php-src is now on git

Ángel González — Tue, 20 Mar 2012 23:20:02 +0100

El 20/03/12 21:45, David Soria Parra escribió:
> On 03/20/2012 09:48 PM, Ángel González wrote:
> > El 19/03/12 21:29, David Soria Parra escribió:
> >> On 2012-03-19, Kris Craig wrote:
> >>> The workflow page currently recommends the "git:" one for
> >>> cloning (which doesn't work for me, either).
> >> git:// is recommended when you can use it. The access is limited
> >> due to port limiations, but the protocl itself is superior to
> >> https for the purpose.
> >>
> >> http is a fallback when you cannot use ssh (developers only) or
> >> git
> > Actually, the provided url is wrong. It lists
> > http://git.php.net/repository/php-src.git but that returns "ERR
> > access denied or repository not exported: /repository/php-src.git"
> > (that's an error given by the server)
>
> http://git.php.net/repository/php-src.git
> works for me

Sorry David. I managed to paste the wrong url there. :/
The bad url is git://git.php.net/repository/php-src.git

If you replace the protocol in my above mail, it will begin to make
sense, specially how it becomes in the working
git://git.php.net/php-src.git
after dropping "repository" from the path.

Best regards

--
PHP Internals - PHP Runtime Development Mailing List
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-DEV] php-src is now on git

Christopher Jones — Tue, 20 Mar 2012 00:20:06 +0100

On 03/19/2012 03:26 PM, Kris Craig wrote:
> On Mon, Mar 19, 2012 at 3:07 PM, Christopher Jones<
> christopher.jones@oracle.com> wrote:
>
>>
>>
>> On 03/19/2012 01:31 PM, Kris Craig wrote:
>>
>>> Here's what I wound-up doing: The merge entries on the workflow page now
>>> contain "--no-ff" and I added an entry to the FAQ about the merge.ff option
>>> available in newer clients. This way we should be covered either way. =)
>>> --Kris
>>>
>>
>> Is this supported by the php-src repo? This is what I get after using
>> --no-ff:
>>
>> $ git push origin
>> To https://git.php.net/**repository/php-src.githttps://git.php.net/repository/php-src.git
>> ! [rejected] PHP-5.3 -> PHP-5.3 (non-fast-forward)
>> ! [rejected] PHP-5.4 -> PHP-5.4 (non-fast-forward)
>> ! [rejected] master -> master (non-fast-forward)
>> error: failed to push some refs to 'https://git.php.net/**
>> repository/php-src.githttps://git.php.net/repository/php-src.git'
>> To prevent you from losing history, non-fast-forward updates were rejected
>> Merge the remote changes (e.g. 'git pull') before pushing again. See the
>> 'Note about fast-forwards' section of 'git push --help' for details.
>>
>>
>> --
>> Email: christopher.jones@oracle.com
>> Tel: +1 650 506 8630
>> Blog: http://blogs.oracle.com/opal/
>>
>>
> That error can sometimes be misleading. I've noticed that it typically
> happens if you're trying to push a branch containing merged commits to a
> remote version of that branch that is newer than the one your commits were
> merged into (i.e. you forgot to do a git pull followed by a git rebase
> before doing the merge). I can't say for certain but that's a likely
> possibility that that's what happened in your case.

Could be. Thanks for the details.

Chris

--
Email: christopher.jones@oracle.com
Tel: +1 650 506 8630
Blog: http://blogs.oracle.com/opal/

--
PHP Internals - PHP Runtime Development Mailing List
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-DEV] php-src is now on git

Kris Craig — Tue, 20 Mar 2012 00:20:06 +0100

On Mon, Mar 19, 2012 at 4:03 PM, Ferenc Kovacs wrote:

>
>> Specifically, I noticed the "SSH Key" field in user administration (is
>> that
>> new or was that always there?).
>
>
> https://wiki.php.net/vcs/gitfaq#using_ssh
>
> --
> Ferenc Kovács
> @Tyr43l - http://tyrael.hu
>

Lol yep that's where I found it! What I'm asking though is whether this
should be the *recommended* approach on the workflow page. I.e. are there
any potential problems with having too many people using the SSH login at
once, for example?

--Kris

Re: [PHP-DEV] php-src is now on git

Ferenc Kovacs — Tue, 20 Mar 2012 00:10:02 +0100

>
>
> Specifically, I noticed the "SSH Key" field in user administration (is that
> new or was that always there?).

https://wiki.php.net/vcs/gitfaq#using_ssh

--
Ferenc Kovács
@Tyr43l - http://tyrael.hu

Re: [PHP-DEV] php-src is now on git

Kris Craig — Mon, 19 Mar 2012 23:40:02 +0100

Question:

On Mon, Mar 19, 2012 at 2:01 PM, Kris Craig wrote:

>
>
> On Mon, Mar 19, 2012 at 1:39 PM, Christopher Jones <
> christopher.jones@oracle.com> wrote:
>
>>
>>
>> On 03/19/2012 01:31 PM, Kris Craig wrote:
>>
>>> I added an entry to the FAQ about the merge.ff option
>>> available in newer clients.
>>>
>>
>> Would it be more visible if that comment was moved to the Recommended Git
>> Settings section?
>>
>>
>> Chris
>>
>> --
>> Email: christopher.jones@oracle.com
>> Tel: +1 650 506 8630
>> Blog: http://blogs.oracle.com/opal/
>>
>>
> Hmm good idea, I'll move it there and mention the client version
> requirement (tnx for looking that up, Gábor!).
>
> --Kris
>
>
Regarding the recommended method for using git clone, after a little
tinkering I realized that I do, in fact, have SSH access for Git-- Or, to
be more precise, I didn't have access but I had the ability to make it so
that I did.

Specifically, I noticed the "SSH Key" field in user administration (is that
new or was that always there?). By using ssh-keygen and adding the
newly-generated public key to that field in my php.net user account, I was
able to successfully perform a git clone using git@git.php.net:php-src.git.

So here's my question: Assuming everyone with SVN karma can do this as
well, is there any cost that would make it undesirable for us to recommend
wide use of this? I.e. I remember somebody mentioning something about
limited SSH ports available. Could you elaborate on that?

If it is doable, then I'd recommend scrapping my previous suggestion and
going with the SSH option (though still mentioning the https one as an
lighter-weight alternative) and also adding a brief section on how to
configure add/configure the necessary keys to make it work. Again I'm more
than happy to do the heavy lifting on actually updating the docs; I just
want to make sure we're all on the same page before I do.

Thanks! =)

--Kris

Re: [PHP-DEV] php-src is now on git

Kris Craig — Mon, 19 Mar 2012 23:30:02 +0100

On Mon, Mar 19, 2012 at 3:07 PM, Christopher Jones <
christopher.jones@oracle.com> wrote:

>
>
> On 03/19/2012 01:31 PM, Kris Craig wrote:
>
>> Here's what I wound-up doing: The merge entries on the workflow page now
>> contain "--no-ff" and I added an entry to the FAQ about the merge.ff option
>> available in newer clients. This way we should be covered either way. =)
>> --Kris
>>
>
> Is this supported by the php-src repo? This is what I get after using
> --no-ff:
>
> $ git push origin
> To https://git.php.net/**repository/php-src.githttps://git.php.net/repository/php-src.git
> ! [rejected] PHP-5.3 -> PHP-5.3 (non-fast-forward)
> ! [rejected] PHP-5.4 -> PHP-5.4 (non-fast-forward)
> ! [rejected] master -> master (non-fast-forward)
> error: failed to push some refs to 'https://git.php.net/**
> repository/php-src.git https://git.php.net/repository/php-src.git'
> To prevent you from losing history, non-fast-forward updates were rejected
> Merge the remote changes (e.g. 'git pull') before pushing again. See the
> 'Note about fast-forwards' section of 'git push --help' for details.
>
>
> --
> Email: christopher.jones@oracle.com
> Tel: +1 650 506 8630
> Blog: http://blogs.oracle.com/opal/
>
>
That error can sometimes be misleading. I've noticed that it typically
happens if you're trying to push a branch containing merged commits to a
remote version of that branch that is newer than the one your commits were
merged into (i.e. you forgot to do a git pull followed by a git rebase
before doing the merge). I can't say for certain but that's a likely
possibility that that's what happened in your case.

Moving forward, we should probably add that to the workflow as it can save
a lot of headaches moving forward. Specifically, when merging in a branch:

1. git checkout
2. git pull [destination branch]
3. git checkout
4. git rebase
5. git checkout
6. git merge --no-ff
7. git push origin [destination branch]
8. git branch -d

What often happens is that you'll pull a branch then start working on a
feature branch. However, while you're doing that, somebody else pushes a
newer version of the branch you pulled. If you then merge into the older
"revision" of that branch without first making sure it's up-to-date,
everything will blow up in your face when you try to do a push. Despite
the migraines this tends to cause, it's actually a good thing that it does
this. After all, we don't *want* an older version of a branch being dumped
on top of a newer version. That would get very ugly lol. The only
downside is that the resulting error message when using --no-ff is
needlessly confusing for newcomers.

Assuming that's what happened in your case, you've got some damage control
to do. Whenever I'm training people in the office on using Git and they
make this inevitable mistake, I always tell them to think of the damage
control as good practice lol. =)

Anyway, assuming you haven't yet deleted the original feature branch, this
will be really easy:

1. git checkout -b
- Creates a backup copy of the outdated branch with the merges.
2. git branch -D
- Deletes the corrupted branch. Note that uppercase "-D" is required
since this is considered an "unsafe" delete.
3. git checkout -b origin/
- Re-creates the branch you just deleted, this time just grabbing the
one currently on the remote origin.
4. git checkout
- Checkout the feature branch that you originally merged into the
develop branch.
5. git rebase
- Your feature branch will now be based off of the current develop
branch that you just pulled from the remote origin.
6. git checkout
7. git merge --no-ff
- Merge the newly-rebased feature branch into this branch.
8. git push origin [corrupted branch name]
- Now your push should be successful.

I hope that helps! =)

--Kris

Re: [PHP-DEV] php-src is now on git

Christopher Jones — Mon, 19 Mar 2012 23:10:02 +0100

On 03/19/2012 01:31 PM, Kris Craig wrote:
> Here's what I wound-up doing: The merge entries on the workflow page now contain "--no-ff" and I added an entry to the FAQ about the merge.ff option available in newer clients. This way we should be covered either way. =) --Kris

Is this supported by the php-src repo? This is what I get after using --no-ff:

$ git push origin
To https://git.php.net/repository/php-src.git
! [rejected] PHP-5.3 -> PHP-5.3 (non-fast-forward)
! [rejected] PHP-5.4 -> PHP-5.4 (non-fast-forward)
! [rejected] master -> master (non-fast-forward)
error: failed to push some refs to 'https://git.php.net/repository/php-src.git'
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes (e.g. 'git pull') before pushing again. See the
'Note about fast-forwards' section of 'git push --help' for details.

--
Email: christopher.jones@oracle.com
Tel: +1 650 506 8630
Blog: http://blogs.oracle.com/opal/

--
PHP Internals - PHP Runtime Development Mailing List
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-DEV] php-src is now on git

Kris Craig — Mon, 19 Mar 2012 22:10:02 +0100

On Mon, Mar 19, 2012 at 1:39 PM, Christopher Jones <
christopher.jones@oracle.com> wrote:

>
>
> On 03/19/2012 01:31 PM, Kris Craig wrote:
>
>> I added an entry to the FAQ about the merge.ff option
>> available in newer clients.
>>
>
> Would it be more visible if that comment was moved to the Recommended Git
> Settings section?
>
>
> Chris
>
> --
> Email: christopher.jones@oracle.com
> Tel: +1 650 506 8630
> Blog: http://blogs.oracle.com/opal/
>
>
Hmm good idea, I'll move it there and mention the client version
requirement (tnx for looking that up, Gábor!).

--Kris

Re: [PHP-DEV] php-src is now on git

Gábor Fási — Mon, 19 Mar 2012 22:00:02 +0100

On Mon, Mar 19, 2012 at 21:31, Kris Craig wrote:
> I don't know off the top of my head which version it was implemented in,
> but I'm pretty sure it was relatively recent.

It was introduced in 1.7.6, that came out around Summer 2011.

-- Gábor

--
PHP Internals - PHP Runtime Development Mailing List
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-DEV] php-src is now on git

Christopher Jones — Mon, 19 Mar 2012 21:50:02 +0100

On 03/19/2012 01:31 PM, Kris Craig wrote:
> I added an entry to the FAQ about the merge.ff option
> available in newer clients.

Would it be more visible if that comment was moved to the Recommended Git Settings section?

Chris

--
Email: christopher.jones@oracle.com
Tel: +1 650 506 8630
Blog: http://blogs.oracle.com/opal/

Re: [PHP-DEV] php-src is now on git

Kris Craig — Mon, 19 Mar 2012 21:40:02 +0100

On Mon, Mar 19, 2012 at 1:16 PM, Simon Schick
wrote:

> 2012/3/19 Kris Craig :
> > Simon,
> >
> > Yes that's a great recommendation and it should definitely be included
> > IMHO! However, the merge.ff option is relatively new and is not
> available
> > in many older Git clients that are still in use. So the --no-ff tag will
> > still probably be necessary for some people. Perhaps we should recommend
> > both, or would that make things too confusing?
> >
> > --Kris
> >
>
> Hi, Kris
>
> Don't really know ... Do you know which version of GIT is the first
> who implements this feature? Would it be a problem to require an
> update or the people should find their own solution?
> I think that people who don't know much about GIT or are just starting
> with GIT should be fine with that as they haven't done much with that
> or just installed the latest version.
> The only problem I can see here is that some linux-distributions
> (Debian for example) tends to keep old versions in their repositories
> ;) Anyways ...
> I think it would be max-information to link the
> stackoverflow-discussion there if someone has a question to that. But
> this (of course) has to be describe it in a easy understandable way :)
> and I think that's the most dificult part.
>
> Bye
> Simon
>

I don't know off the top of my head which version it was implemented in,
but I'm pretty sure it was relatively recent.

Here's what I wound-up doing: The merge entries on the workflow page now
contain "--no-ff" and I added an entry to the FAQ about the merge.ff option
available in newer clients. This way we should be covered either way. =)

--Kris

Re: [PHP-DEV] php-src is now on git

David Soria Parra — Mon, 19 Mar 2012 21:40:02 +0100

On 2012-03-19, Kris Craig wrote:
> --f46d043892b5b345eb04bb9cfe02
> Content-Type: text/plain; charset=ISO-8859-1
>
> Hey Chris,
>
> On Mon, Mar 19, 2012 at 11:40 AM, Christopher Jones <
> christopher.jones@oracle.com> wrote:
> I sense your hostility but I think you misunderstood my question. The
> workflow page currently recommends the "git:" one for cloning (which
> doesn't work for me, either). I think it should be changed to "https://";,
> and I fully intend on making the change myself but first I wanted to ask
> here to make sure there wasn't a reason why they went with "git:" instead
> (i.e. I don't want to step on anybody's toes).

git:// is recommended when you can use it. The access is limited due to
port limiations, but the protocl itself is superior to https for
the purpose.

http is a fallback when you cannot use ssh (developers only) or git

--
PHP Internals - PHP Runtime Development Mailing List
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-DEV] php-src is now on git

Simon Schick — Mon, 19 Mar 2012 21:20:01 +0100

2012/3/19 Kris Craig :
> Simon,
>
> Yes that's a great recommendation and it should definitely be included
> IMHO! However, the merge.ff option is relatively new and is not available
> in many older Git clients that are still in use. So the --no-ff tag will
> still probably be necessary for some people. Perhaps we should recommend
> both, or would that make things too confusing?
>
> --Kris
>

Hi, Kris

Don't really know ... Do you know which version of GIT is the first
who implements this feature? Would it be a problem to require an
update or the people should find their own solution?
I think that people who don't know much about GIT or are just starting
with GIT should be fine with that as they haven't done much with that
or just installed the latest version.
The only problem I can see here is that some linux-distributions
(Debian for example) tends to keep old versions in their repositories
;) Anyways ...
I think it would be max-information to link the
stackoverflow-discussion there if someone has a question to that. But
this (of course) has to be describe it in a easy understandable way :)
and I think that's the most dificult part.

Bye
Simon

--
PHP Internals - PHP Runtime Development Mailing List
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-DEV] php-src is now on git

Alexander Moskaliov — Mon, 19 Mar 2012 20:40:02 +0100

I think we can add it now, because we have already moved to git all web
sources.
With regards, Alexander Moskaliov
Irker@irker.net

2012/3/19 Christopher Jones

> Do you want to add it back (now or as appropriate), mentioning webprojects
> & documentation?

Re: [PHP-DEV] php-src is now on git

Kris Craig — Mon, 19 Mar 2012 20:20:02 +0100

FYI-

On Mon, Mar 19, 2012 at 8:24 AM, David Soria Parra wrote:

> Hi Internals,
>
> The initial migration is done and initial testing was successful.
>
> http://git.php.net/?p=php-src.git;a=summary
> http://github.com/php/php-src
>
> Please note that some branches and tags were renamed to make
> the repository cleaner.
>
> Please checkout the repository and play around. I have created
> a workflow wiki page at https://wiki.php.net/vcs/gitworkflow.
> There is also an FAQ at https://wiki.php.net/vcs/gitfaq.
>
> If you have questions about the workflow or problems let me know.
> General git questions should be asked in the appropriate IRC channels
> and mailinglists.
>
> David
>
> --
> PHP Internals - PHP Runtime Development Mailing List
> To unsubscribe, visit: http://www.php.net/unsub.php
>
>
If you don't already have Git installed on your system and aren't sure
how/where to get it, I added a list on the FAQ for all major operating
systems.

--Kris

Re: [PHP-DEV] php-src is now on git

Kris Craig — Mon, 19 Mar 2012 20:00:02 +0100

Simon,

On Mon, Mar 19, 2012 at 11:55 AM, Simon Schick
wrote:

> 2012/3/19 Kris Craig :
> > Hey,
> >
> > Could we modify the workflow to recommend using the "--no-ff" switch when
> > merging in a feature branch? This is by and large the recommended
> approach
> > as it preserves the feature branch's commit history, making it
> > *much*easier to sort through complex features that contain numerous
> > commits.
> >
> > --Kris
>
> Hi, Kris
>
> I'd instead suggest to execute the following command in the git-repository:
>
> git config --add merge.ff false
>
> Then you do not have to add --no-ff to every merge-command you're doing.
>
> You could even set it per branch if you want :) (just to round it up ..)
>
> http://stackoverflow.com/questions/2500296/can-i-make-fast-forwarding-be-off-by-default-in-git
>
> Bye
> Simon
>

Yes that's a great recommendation and it should definitely be included
IMHO! However, the merge.ff option is relatively new and is not available
in many older Git clients that are still in use. So the --no-ff tag will
still probably be necessary for some people. Perhaps we should recommend
both, or would that make things too confusing?

--Kris

Re: [PHP-DEV] php-src is now on git

Simon Schick — Mon, 19 Mar 2012 20:00:02 +0100

2012/3/19 Kris Craig :
> Hey,
>
> Could we modify the workflow to recommend using the "--no-ff" switch when
> merging in a feature branch? This is by and large the recommended approach
> as it preserves the feature branch's commit history, making it
> *much*easier to sort through complex features that contain numerous
> commits.
>
> --Kris

Hi, Kris

I'd instead suggest to execute the following command in the git-repository:

git config --add merge.ff false

Then you do not have to add --no-ff to every merge-command you're doing.

You could even set it per branch if you want :) (just to round it up ..)
http://stackoverflow.com/questions/2500296/can-i-make-fast-forwarding-be-off-by-default-in-git

Bye
Simon

--
PHP Internals - PHP Runtime Development Mailing List
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-DEV] php-src is now on git

Christopher Jones — Mon, 19 Mar 2012 20:00:02 +0100

On 03/19/2012 11:46 AM, Alexander Moskaliov wrote:
> Really it was a mistake to do this option recommended (I did it =)). But I think for webprojects and documentation will need to mention this option.
>
> With regards, Alexander Moskaliov
> Irker@irker.net

Do you want to add it back (now or as appropriate), mentioning webprojects & documentation?

Chris

--
Email: christopher.jones@oracle.com
Tel: +1 650 506 8630
Blog: http://blogs.oracle.com/opal/

--
PHP Internals - PHP Runtime Development Mailing List
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-DEV] php-src is now on git

Kris Craig — Mon, 19 Mar 2012 20:00:02 +0100

On Mon, Mar 19, 2012 at 11:46 AM, Alexander Moskaliov wrote:

> Really it was a mistake to do this option recommended (I did it =)). But
> I think for webprojects and documentation will need to mention this option.
>
> With regards, Alexander Moskaliov
> Irker@irker.net
>
>
> 2012/3/19 Christopher Jones
>
> >
> >
> > On 03/19/2012 10:19 AM, David Soria Parra wrote:
> >
> > Also a small thing - gitfaq recommends git config core.autocrlf
> >>> input, but we have some files in win32 which do not work with this
> >>> setting (at least on my Mac).
> >>>
> >>
> >> ah okay, can you remove it please? Thanks
> >>
> >
> > Done.
> >
> > --
> > Email: christopher.jones@oracle.com
> > Tel: +1 650 506 8630
> > Blog: http://blogs.oracle.com/opal/
> >
> >
> > --
> > PHP Internals - PHP Runtime Development Mailing List
> > To unsubscribe, visit: http://www.php.net/unsub.php
> >
> >
>

Ahh ok then I figured it was probably something like that but wanted to
make sure lol. I'll go ahead and make the correction. =)

--Kris

Re: [PHP-DEV] php-src is now on git

Kris Craig — Mon, 19 Mar 2012 19:50:02 +0100

Hey Chris,

On Mon, Mar 19, 2012 at 11:40 AM, Christopher Jones <
christopher.jones@oracle.com> wrote:

>
>
> On 03/19/2012 11:34 AM, Kris Craig wrote:
>
> I noticed that the workflow page recommends using the SSH URL for cloning.
>> However, isn't that one much more limited access? I.e. for myself at
>> least, it just prompts for a password (presumably for the SSH "git" user)
>> which of course I don't have. Is there a reason why that's recommended or
>> is it just a typo? If the latter, I'd be inclined to change it to the SSL
>> (i.e. https) URL (which the FAQ recommends for clone/push and utilizes
>> php.net credentials) to minimize confusion.
>>
>>
> Which exact bit are you talking about, and did you check the page commit
> history?
>
> I added https:// because git: is not usable from where I am.
>
> I believe from your emails you have more git experience than me, and I
> know you've been asked several times to contribute to the docs: go do it.
>
> Chris
>
>
>
> --
> Email: christopher.jones@oracle.com
> Tel: +1 650 506 8630
> Blog: http://blogs.oracle.com/opal/
>
> --
> PHP Internals - PHP Runtime Development Mailing List
> To unsubscribe, visit: http://www.php.net/unsub.php
>
>
I sense your hostility but I think you misunderstood my question. The
workflow page currently recommends the "git:" one for cloning (which
doesn't work for me, either). I think it should be changed to "https://";,
and I fully intend on making the change myself but first I wanted to ask
here to make sure there wasn't a reason why they went with "git:" instead
(i.e. I don't want to step on anybody's toes).

If nobody objects then yeah I'll gladly update it myself. =)

--Kris

Re: [PHP-DEV] php-src is now on git

Alexander Moskaliov — Mon, 19 Mar 2012 19:50:02 +0100

Really it was a mistake to do this option recommended (I did it =)). But
I think for webprojects and documentation will need to mention this option.

With regards, Alexander Moskaliov
Irker@irker.net

2012/3/19 Christopher Jones

>
>
> On 03/19/2012 10:19 AM, David Soria Parra wrote:
>
> Also a small thing - gitfaq recommends git config core.autocrlf
>>> input, but we have some files in win32 which do not work with this
>>> setting (at least on my Mac).
>>>
>>
>> ah okay, can you remove it please? Thanks
>>
>
> Done.
>
> --
> Email: christopher.jones@oracle.com
> Tel: +1 650 506 8630
> Blog: http://blogs.oracle.com/opal/
>
>
> --
> PHP Internals - PHP Runtime Development Mailing List
> To unsubscribe, visit: http://www.php.net/unsub.php
>
>

Re: [PHP-DEV] php-src is now on git

Christopher Jones — Mon, 19 Mar 2012 19:50:02 +0100

On 03/19/2012 11:34 AM, Kris Craig wrote:

> I noticed that the workflow page recommends using the SSH URL for cloning.
> However, isn't that one much more limited access? I.e. for myself at
> least, it just prompts for a password (presumably for the SSH "git" user)
> which of course I don't have. Is there a reason why that's recommended or
> is it just a typo? If the latter, I'd be inclined to change it to the SSL
> (i.e. https) URL (which the FAQ recommends for clone/push and utilizes
> php.net credentials) to minimize confusion.
>

Which exact bit are you talking about, and did you check the page commit
history?

I added https:// because git: is not usable from where I am.

I believe from your emails you have more git experience than me, and I
know you've been asked several times to contribute to the docs: go do it.

Chris

--
Email: christopher.jones@oracle.com
Tel: +1 650 506 8630
Blog: http://blogs.oracle.com/opal/

--
PHP Internals - PHP Runtime Development Mailing List
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-DEV] php-src is now on git

Kris Craig — Mon, 19 Mar 2012 19:50:02 +0100

Me again,

On Mon, Mar 19, 2012 at 11:34 AM, Kris Craig wrote:

> Also,
>
>
> On Mon, Mar 19, 2012 at 11:21 AM, Kris Craig wrote:
>
>> Hey,
>>
>>
>> On Mon, Mar 19, 2012 at 8:24 AM, David Soria Parra wrote:
>>
>>> Hi Internals,
>>>
>>> The initial migration is done and initial testing was successful.
>>>
>>> http://git.php.net/?p=php-src.git;a=summary
>>> http://github.com/php/php-src
>>>
>>> Please note that some branches and tags were renamed to make
>>> the repository cleaner.
>>>
>>> Please checkout the repository and play around. I have created
>>> a workflow wiki page at https://wiki.php.net/vcs/gitworkflow.
>>> There is also an FAQ at https://wiki.php.net/vcs/gitfaq.
>>>
>>> If you have questions about the workflow or problems let me know.
>>> General git questions should be asked in the appropriate IRC channels
>>> and mailinglists.
>>>
>>> David
>>>
>>> --
>>> PHP Internals - PHP Runtime Development Mailing List
>>> To unsubscribe, visit: http://www.php.net/unsub.php
>>>
>>>
>> Could we modify the workflow to recommend using the "--no-ff" switch when
>> merging in a feature branch? This is by and large the recommended approach
>> as it preserves the feature branch's commit history, making it *much*easier to sort through complex features that contain numerous commits.
>>
>> --Kris
>>
>>
> I noticed that the workflow page recommends using the SSH URL for
> cloning. However, isn't that one much more limited access? I.e. for
> myself at least, it just prompts for a password (presumably for the SSH
> "git" user) which of course I don't have. Is there a reason why that's
> recommended or is it just a typo? If the latter, I'd be inclined to change
> it to the SSL (i.e. https) URL (which the FAQ recommends for clone/push and
> utilizes php.net credentials) to minimize confusion.
>
> --Kris
>
>
Also on the workflow page, it shouldn't be necessary to do "git checkout -b
PHP-5.3 origin/PHP-5.3" if the local repo is already tracking from remote
(which it is if you did a git clone to set it up). Instead, you can simply
do "git checkout PHP-5.3" and it will automatically track from the remote
branch and pull the necessary data to create a local working copy.

Any objections to me changing that? The less confusing we can make it,
particularly for people who are already struggling with the SVN
withdrawals, the better IMHO. =)

--Kris

Re: [PHP-DEV] php-src is now on git

Kris Craig — Mon, 19 Mar 2012 19:40:02 +0100

Also,

On Mon, Mar 19, 2012 at 11:21 AM, Kris Craig wrote:

> Hey,
>
>
> On Mon, Mar 19, 2012 at 8:24 AM, David Soria Parra wrote:
>
>> Hi Internals,
>>
>> The initial migration is done and initial testing was successful.
>>
>> http://git.php.net/?p=php-src.git;a=summary
>> http://github.com/php/php-src
>>
>> Please note that some branches and tags were renamed to make
>> the repository cleaner.
>>
>> Please checkout the repository and play around. I have created
>> a workflow wiki page at https://wiki.php.net/vcs/gitworkflow.
>> There is also an FAQ at https://wiki.php.net/vcs/gitfaq.
>>
>> If you have questions about the workflow or problems let me know.
>> General git questions should be asked in the appropriate IRC channels
>> and mailinglists.
>>
>> David
>>
>> --
>> PHP Internals - PHP Runtime Development Mailing List
>> To unsubscribe, visit: http://www.php.net/unsub.php
>>
>>
> Could we modify the workflow to recommend using the "--no-ff" switch when
> merging in a feature branch? This is by and large the recommended approach
> as it preserves the feature branch's commit history, making it *much*easier to sort through complex features that contain numerous commits.
>
> --Kris
>
>
I noticed that the workflow page recommends using the SSH URL for cloning.
However, isn't that one much more limited access? I.e. for myself at
least, it just prompts for a password (presumably for the SSH "git" user)
which of course I don't have. Is there a reason why that's recommended or
is it just a typo? If the latter, I'd be inclined to change it to the SSL
(i.e. https) URL (which the FAQ recommends for clone/push and utilizes
php.net credentials) to minimize confusion.

--Kris

Re: [PHP-DEV] php-src is now on git

Kris Craig — Mon, 19 Mar 2012 19:30:01 +0100

Hey,

On Mon, Mar 19, 2012 at 8:24 AM, David Soria Parra wrote:

> Hi Internals,
>
> The initial migration is done and initial testing was successful.
>
> http://git.php.net/?p=php-src.git;a=summary
> http://github.com/php/php-src
>
> Please note that some branches and tags were renamed to make
> the repository cleaner.
>
> Please checkout the repository and play around. I have created
> a workflow wiki page at https://wiki.php.net/vcs/gitworkflow.
> There is also an FAQ at https://wiki.php.net/vcs/gitfaq.
>
> If you have questions about the workflow or problems let me know.
> General git questions should be asked in the appropriate IRC channels
> and mailinglists.
>
> David
>
> --
> PHP Internals - PHP Runtime Development Mailing List
> To unsubscribe, visit: http://www.php.net/unsub.php
>
>
Could we modify the workflow to recommend using the "--no-ff" switch when
merging in a feature branch? This is by and large the recommended approach
as it preserves the feature branch's commit history, making it
*much*easier to sort through complex features that contain numerous
commits.

--Kris

Re: [PHP-DEV] php-src is now on git

Christopher Jones — Mon, 19 Mar 2012 19:00:02 +0100

On 03/19/2012 10:19 AM, David Soria Parra wrote:

>> Also a small thing - gitfaq recommends git config core.autocrlf
>> input, but we have some files in win32 which do not work with this
>> setting (at least on my Mac).
>
> ah okay, can you remove it please? Thanks

Done.

--
Email: christopher.jones@oracle.com
Tel: +1 650 506 8630
Blog: http://blogs.oracle.com/opal/

--
PHP Internals - PHP Runtime Development Mailing List
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-DEV] php-src is now on git

David Soria Parra — Mon, 19 Mar 2012 18:40:01 +0100

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

>> [git] branch PHP-5.4 updated. | [git] commit ab33e5176ae
>> ext/lib/date
>
> Can we strip out as much "nonsense" from there as possible? I am
> mostly interested in the short part of the commit message; and not
> the words "commit", and the hash.

we can strip [git]
i personally think "commit" and the hash are necessary information but
if people disagree we can change it. the current format shouldnt be a
problem for the main purpose of filtering mails based on paths.

> I was mostly wondering where they are going to be sent to though..
> PHP-CVS I hope?
php-cvs

>
> cheers, Derick
>

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQIcBAEBAgAGBQJPZ20fAAoJEAT0aMuPE7Z1w/oP/0sLoQYAPM4dUCzX+fOU96Xy
efiZccfsWfj8VZ5XUEUtA1dYYmGQeYt5TL+SLxdS//L2e6g7Ndi7ANcbDTDb+XGe
W3/dLJxQbyksY773hr2kCWzMV5oZpbaqGKAj5jQlQnsNt6H54lyo0eY/JgaqY7YQ
2EhPHLGZiYRqZkcsjB09PqqyutJRLXkOd5ef6VjAlynZ+x6duC67zw/9LbYzGrSB
Mmw7y8o7dqvs+fPJJXPvUBPOvu5hJP9hW0VJEIzMsq0i8lanhtfjVNelcfXACuMY
U/SLSjdOoQTe/JNSVujTH8evZesLyuLKn/gs1XwY4nIl98Glhv/JSrq/RvC6lFAe
ewghEOX7swr/VmSeFBwQ7miLGRn/dKD7d+FY+Ay6FaADXUx9KwGHhvdp1YLPvwnd
C5/RrZFEC4fcnjwcJ68B/jhr4ZtRs0g/9WVZ4l1/8rWOviQqiEOrXgoELim+LYy3
yX0r8rmXICreuE0TaxBSS4VABsHk0guerT+XbB0TDysKyaMgE9RDx820A5aOPyUI
BWLzDsibU8J5bJS81VetSbnq6YYWelxoCzsmFtRiSW+R1+xvu2rJeh7sWJYtwkc7
/FL2ftuQTysSUxb5zpXVt1F2MLQc62eonU4SBBvqY73PAZZ0jGHyiaJtrqLzI3qv
WLelvoXKqgLCedNJkyDc
=T/FL
-----END PGP SIGNATURE-----

--
PHP Internals - PHP Runtime Development Mailing List
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-DEV] php-src is now on git

Derick Rethans — Mon, 19 Mar 2012 18:30:21 +0100

On Mon, 19 Mar 2012, David Soria Parra wrote:

> On 03/19/2012 06:20 PM, Derick Rethans wrote:
> > On Mon, 19 Mar 2012, David Soria Parra wrote:
> >
> >> There is also an FAQ at https://wiki.php.net/vcs/gitfaq.
> >
> > I can't find in the FAQ what's happening with the commit mails. Can
> > you add that (and CC this list too)? (Refering to "The git
> > push/commit email notification process is under discussion (Jan
> > 2012). For mail lists see http://php.net/mailing-lists.php"; as well
> > in the FAQ).
>
> I will add that.
>
> For every push a mail with a log what revisions are pushed will be
> mailed. For every commit in the push a follow up with changed files in
> the subject will be mailed too.
>
> The format should be:
>
> [git] branch PHP-5.4 updated.
> | [git] commit ab33e5176ae ext/lib/date

Can we strip out as much "nonsense" from there as possible? I am mostly
interested in the short part of the commit message; and not the words
"commit", and the hash.

I was mostly wondering where they are going to be sent to though..
PHP-CVS I hope?

cheers,
Derick

--
http://derickrethans.nl | http://xdebug.org
Like Xdebug? Consider a donation: http://xdebug.org/donate.php
twitter: @derickr and @xdebug

--
PHP Internals - PHP Runtime Development Mailing List
To unsubscribe, visit: http://www.php.net/unsub.php