Poky-contrib access

Poky-contrib access

[Paul Eggleton]

Hi folks,

As we've talked about, in order to contribute to Toaster, you really need to 
get push access to the poky-contrib repository so you can push your own 
branches there for people to review. In order to do that, you need to:

1) If you haven't already, generate an SSH key pair on your machine

2) Send a request for push access to poky-contrib with the *public* key 
attached to Michael Halstead <michael@yoctoproject.org>

3) Once Michael has added your key, either:

a) Add poky-contrib as a remote:

  git add poky-contrib ssh://git@git.yoctoproject.org/poky-contrib

b) or, if you already have a read-only poky-contrib remote set up, point it to 
the read/write URL:

  git remote set-url poky-contrib ssh://git@git.yoctoproject.org/poky-contrib


Once this has been set up you should be able to push branches to poky-contrib 
like so:

  git push poky-contrib <branchname>

Where <branchname> should be an already existing local branch that you've 
created, and should be named <your-login-name>/<topic> e.g. I might have a 
branch named "paule/bugfixes" (without quotes). This naming makes it clear who 
the branches belong to. Pushed branches should be immediately visible here:

  http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/

For toaster changes you'd then just send an email to this mailing list with a 
link to the web page for the branch requesting review.

A couple of notes:

* If you need to, you can delete remote branches by simply pushing "nothing" 
to them, like so:

  git push poky-contrib :<branchname>

(notice the colon with nothing on the left side of it). Obviously the usual 
care should be taken when deleting remote branches. Typically branches are 
deleted by their owner at some time after the changes have been merged.

* If you've pushed a branch already, and you've subsequently rebased/otherwise 
modified it by doing something other than just adding patches on top and you 
try to push it again, git will complain that it can't push because it's not 
"fast-forward". To resolve this you need to force the push by adding the -f 
option. Again, you need to take care to ensure you're pushing to the right 
branch before using this option, as it will overwrite what is currently there 
on the remote.

HTH.

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre

Re: Poky-contrib access

[Paul Eggleton]

On Wednesday 08 January 2014 18:41:57 Paul Eggleton wrote:
> Once this has been set up you should be able to push branches to
> poky-contrib like so:
> 
>   git push poky-contrib <branchname>
> 
> Where <branchname> should be an already existing local branch that you've
> created, and should be named <your-login-name>/<topic> e.g. I might have a
> branch named "paule/bugfixes" (without quotes). 

I should clarify, when I say <your-login-name> this can be any consistent name 
that identifies you, these aren't assigned in the system or anything like that.

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre

Re: Poky-contrib access

[Michael Halstead]

[-- Attachment #1: Type: text/plain, Size: 2901 bytes --]

On 01/08/2014 10:41 AM, Paul Eggleton wrote:
> Hi folks,
>
> As we've talked about, in order to contribute to Toaster, you really need to 
> get push access to the poky-contrib repository so you can push your own 
> branches there for people to review. In order to do that, you need to:
>
> 1) If you haven't already, generate an SSH key pair on your machine
>
> 2) Send a request for push access to poky-contrib with the *public* key 
> attached to Michael Halstead <michael@yoctoproject.org>
Please include your intended branch prefix when sending your public key.
In my case it would be halstead because my branches are all named
halstead/<topic>.
>
> 3) Once Michael has added your key, either:
>
> a) Add poky-contrib as a remote:
>
>   git add poky-contrib ssh://git@git.yoctoproject.org/poky-contrib
Also you'll need to use "remote add". Note that the username when
pushing to git.yoctoproject.org is always git.

git remote add poky-contrib ssh://git@git.yoctoproject.org/poky-contrib


Michael Halstead
Yocto Project / System Administrator

>
> b) or, if you already have a read-only poky-contrib remote set up, point it to 
> the read/write URL:
>
>   git remote set-url poky-contrib ssh://git@git.yoctoproject.org/poky-contrib
>
>
> Once this has been set up you should be able to push branches to poky-contrib 
> like so:
>
>   git push poky-contrib <branchname>
>
> Where <branchname> should be an already existing local branch that you've 
> created, and should be named <your-login-name>/<topic> e.g. I might have a 
> branch named "paule/bugfixes" (without quotes). This naming makes it clear who 
> the branches belong to. Pushed branches should be immediately visible here:
>
>   http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/
>
> For toaster changes you'd then just send an email to this mailing list with a 
> link to the web page for the branch requesting review.
>
> A couple of notes:
>
> * If you need to, you can delete remote branches by simply pushing "nothing" 
> to them, like so:
>
>   git push poky-contrib :<branchname>
>
> (notice the colon with nothing on the left side of it). Obviously the usual 
> care should be taken when deleting remote branches. Typically branches are 
> deleted by their owner at some time after the changes have been merged.
>
> * If you've pushed a branch already, and you've subsequently rebased/otherwise 
> modified it by doing something other than just adding patches on top and you 
> try to push it again, git will complain that it can't push because it's not 
> "fast-forward". To resolve this you need to force the push by adding the -f 
> option. Again, you need to take care to ensure you're pushing to the right 
> branch before using this option, as it will overwrite what is currently there 
> on the remote.
>
> HTH.
>
> Cheers,
> Paul
>



[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4516 bytes --]

Re: Poky-contrib access

[Paul Eggleton]

Hi Michael,

On Wednesday 08 January 2014 11:52:31 Michael Halstead wrote:
> On 01/08/2014 10:41 AM, Paul Eggleton wrote:
> > Hi folks,
> > 
> > As we've talked about, in order to contribute to Toaster, you really need
> > to get push access to the poky-contrib repository so you can push your
> > own branches there for people to review. In order to do that, you need
> > to:
> > 
> > 1) If you haven't already, generate an SSH key pair on your machine
> > 
> > 2) Send a request for push access to poky-contrib with the *public* key
> > attached to Michael Halstead <michael@yoctoproject.org>
> 
> Please include your intended branch prefix when sending your public key.
> In my case it would be halstead because my branches are all named
> halstead/<topic>.

OK, thanks, I wasn't aware of that.

> > 3) Once Michael has added your key, either:
> > 
> > a) Add poky-contrib as a remote:
> >   git add poky-contrib ssh://git@git.yoctoproject.org/poky-contrib
> 
> Also you'll need to use "remote add". Note that the username when
> pushing to git.yoctoproject.org is always git.
> 
> git remote add poky-contrib ssh://git@git.yoctoproject.org/poky-contrib

Oops, mistake on my part. I definitely meant "git remote add" and not "git 
add".

(I guess we should probably add all of this stuff to a wiki page somewhere, if 
we don't already have it.)

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre