[gentoo-science] Git push problems

[gentoo-science] Git push problems

[Justin (jlec)]

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

Hi all.

I continuously see things like

 $ git ph
Pushing to git@github.com:gentoo-science/sci.git
To git@github.com:gentoo-science/sci.git
 ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to 'git@github.com:gentoo-science/sci.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
Pushing to git+ssh://git@git.overlays.gentoo.org/proj/sci.git
To git+ssh://git@git.overlays.gentoo.org/proj/sci.git
 = [up to date]      master -> master
updating local tracking ref 'refs/remotes/origin/master'
Everything up-to-date

but a git pull doesn't bring anything new. This comes from problems with
fast-forwarding.

This is my suggestion here,

We will restrict the push access in gitweb.overlays.gentoo.org to a
small group of people (one, two, three official sci team devs) and move
all other contributions over to github. This small team is then
responsible for the merge and shouldn't screw it up.

What do you think?

Justin


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 901 bytes --]

Re: [gentoo-science] Git push problems

[Nicolas Bock]

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

I have seen the same, but I don't understand what is going on. Why doesn't
a pull on gentoo update anything?


On Tue, Nov 5, 2013 at 1:28 PM, Justin (jlec) <jlec@gentoo.org> wrote:

> Hi all.
>
> I continuously see things like
>
>  $ git ph
> Pushing to git@github.com:gentoo-science/sci.git
> To git@github.com:gentoo-science/sci.git
>  ! [rejected]        master -> master (non-fast-forward)
> error: failed to push some refs to 'git@github.com:gentoo-science/sci.git'
> hint: Updates were rejected because the tip of your current branch is
> behind
> hint: its remote counterpart. Integrate the remote changes (e.g.
> hint: 'git pull ...') before pushing again.
> hint: See the 'Note about fast-forwards' in 'git push --help' for details.
> Pushing to git+ssh://git@git.overlays.gentoo.org/proj/sci.git
> To git+ssh://git@git.overlays.gentoo.org/proj/sci.git
>  = [up to date]      master -> master
> updating local tracking ref 'refs/remotes/origin/master'
> Everything up-to-date
>
> but a git pull doesn't bring anything new. This comes from problems with
> fast-forwarding.
>
> This is my suggestion here,
>
> We will restrict the push access in gitweb.overlays.gentoo.org to a
> small group of people (one, two, three official sci team devs) and move
> all other contributions over to github. This small team is then
> responsible for the merge and shouldn't screw it up.
>
> What do you think?
>
> Justin
>
>

[-- Attachment #2: Type: text/html, Size: 2168 bytes --]

Re: [gentoo-science] Git push problems

[Justin (jlec)]

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

On 05/11/13 21:31, Nicolas Bock wrote:
> I have seen the same, but I don't understand what is going on. Why
> doesn't a pull on gentoo update anything?

see the git push manual -> "NOTE ABOUT FAST-FORWARDS". Most common
situation is that someone pushed something and ammended that commit and
pushed again.

> 
> 
> On Tue, Nov 5, 2013 at 1:28 PM, Justin (jlec) <jlec@gentoo.org
> <mailto:jlec@gentoo.org>> wrote:
> 
>     Hi all.
> 
>     I continuously see things like
> 
>      $ git ph
>     Pushing to git@github.com:gentoo-science/sci.git
>     To git@github.com:gentoo-science/sci.git
>      ! [rejected]        master -> master (non-fast-forward)
>     error: failed to push some refs to
>     'git@github.com:gentoo-science/sci.git'
>     hint: Updates were rejected because the tip of your current branch
>     is behind
>     hint: its remote counterpart. Integrate the remote changes (e.g.
>     hint: 'git pull ...') before pushing again.
>     hint: See the 'Note about fast-forwards' in 'git push --help' for
>     details.
>     Pushing to git+ssh://git@git.overlays.gentoo.org/proj/sci.git
>     <http://git@git.overlays.gentoo.org/proj/sci.git>
>     To git+ssh://git@git.overlays.gentoo.org/proj/sci.git
>     <http://git@git.overlays.gentoo.org/proj/sci.git>
>      = [up to date]      master -> master
>     updating local tracking ref 'refs/remotes/origin/master'
>     Everything up-to-date
> 
>     but a git pull doesn't bring anything new. This comes from problems with
>     fast-forwarding.
> 
>     This is my suggestion here,
> 
>     We will restrict the push access in gitweb.overlays.gentoo.org
>     <http://gitweb.overlays.gentoo.org> to a
>     small group of people (one, two, three official sci team devs) and move
>     all other contributions over to github. This small team is then
>     responsible for the merge and shouldn't screw it up.
> 
>     What do you think?
> 
>     Justin
> 
> 



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 901 bytes --]

Re: [gentoo-science] Git push problems

[Nicolas Bock]

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

On Tue, Nov 5, 2013 at 1:42 PM, Justin (jlec) <jlec@gentoo.org> wrote:

> On 05/11/13 21:31, Nicolas Bock wrote:
> > I have seen the same, but I don't understand what is going on. Why
> > doesn't a pull on gentoo update anything?
>
> see the git push manual -> "NOTE ABOUT FAST-FORWARDS". Most common
> situation is that someone pushed something and ammended that commit and
> pushed again.
>
> Thanks, that's interesting, didn't know that :)



>  >
> >
> > On Tue, Nov 5, 2013 at 1:28 PM, Justin (jlec) <jlec@gentoo.org
> > <mailto:jlec@gentoo.org>> wrote:
> >
> >     Hi all.
> >
> >     I continuously see things like
> >
> >      $ git ph
> >     Pushing to git@github.com:gentoo-science/sci.git
> >     To git@github.com:gentoo-science/sci.git
> >      ! [rejected]        master -> master (non-fast-forward)
> >     error: failed to push some refs to
> >     'git@github.com:gentoo-science/sci.git'
> >     hint: Updates were rejected because the tip of your current branch
> >     is behind
> >     hint: its remote counterpart. Integrate the remote changes (e.g.
> >     hint: 'git pull ...') before pushing again.
> >     hint: See the 'Note about fast-forwards' in 'git push --help' for
> >     details.
> >     Pushing to git+ssh://git@git.overlays.gentoo.org/proj/sci.git
> >     <http://git@git.overlays.gentoo.org/proj/sci.git>
> >     To git+ssh://git@git.overlays.gentoo.org/proj/sci.git
> >     <http://git@git.overlays.gentoo.org/proj/sci.git>
> >      = [up to date]      master -> master
> >     updating local tracking ref 'refs/remotes/origin/master'
> >     Everything up-to-date
> >
> >     but a git pull doesn't bring anything new. This comes from problems
> with
> >     fast-forwarding.
> >
> >     This is my suggestion here,
> >
> >     We will restrict the push access in gitweb.overlays.gentoo.org
> >     <http://gitweb.overlays.gentoo.org> to a
> >     small group of people (one, two, three official sci team devs) and
> move
> >     all other contributions over to github. This small team is then
> >     responsible for the merge and shouldn't screw it up.
> >
> >     What do you think?
> >
> >     Justin
> >
> >
>
>
>
I am all for it.

[-- Attachment #2: Type: text/html, Size: 3965 bytes --]

Re: [gentoo-science] Git push problems

[Christoph Junghans]

2013/11/5 Justin (jlec) <jlec@gentoo.org>:
> Hi all.
>
> I continuously see things like
>
>  $ git ph
> Pushing to git@github.com:gentoo-science/sci.git
> To git@github.com:gentoo-science/sci.git
>  ! [rejected]        master -> master (non-fast-forward)
> error: failed to push some refs to 'git@github.com:gentoo-science/sci.git'
> hint: Updates were rejected because the tip of your current branch is behind
> hint: its remote counterpart. Integrate the remote changes (e.g.
> hint: 'git pull ...') before pushing again.
> hint: See the 'Note about fast-forwards' in 'git push --help' for details.
> Pushing to git+ssh://git@git.overlays.gentoo.org/proj/sci.git
> To git+ssh://git@git.overlays.gentoo.org/proj/sci.git
>  = [up to date]      master -> master
> updating local tracking ref 'refs/remotes/origin/master'
> Everything up-to-date
>
> but a git pull doesn't bring anything new. This comes from problems with
> fast-forwarding.
>
> This is my suggestion here,
>
> We will restrict the push access in gitweb.overlays.gentoo.org to a
> small group of people (one, two, three official sci team devs) and move
> all other contributions over to github. This small team is then
> responsible for the merge and shouldn't screw it up.
>
> What do you think?
+1

>
> Justin
>



-- 
Christoph Junghans
http://dev.gentoo.org/~ottxor/

Re: [gentoo-science] Git push problems

[justin]

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

Hi,

after talking to our infra guys and alexxy about it, I came to the point
that we should still allow commits to both repos for everyone with
commit access.

To avoid future trouble here are some rules to stick to.

* Don't _amend_ already pushed commits.
* Don't _rebase_ already pushed commits.
* Don't --force a push.

In case you still have problems, then follow this receipt from alexxy.
He will write some longer instructions soonish in the wiki.

$ git fetch --all (assume that you added github as another upstream.
origin is g.o.g.o and github is github)
$ git merge github/master
$ git push origin
that will merge github to g.o.g.o
now we should merge g.o.g.o back to github
$ git checkout -b github github/master
$ git merge origin/master
$ git push github HEAD:master
$ git checkout master

That should fix our problems.

Justin


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 268 bytes --]

Re: [gentoo-science] Git push problems

[Nicolas Bock]

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

Thanks for the recipe!


On Thu, Nov 7, 2013 at 1:22 PM, justin <jlec@gentoo.org> wrote:

> Hi,
>
> after talking to our infra guys and alexxy about it, I came to the point
> that we should still allow commits to both repos for everyone with
> commit access.
>
> To avoid future trouble here are some rules to stick to.
>
> * Don't _amend_ already pushed commits.
> * Don't _rebase_ already pushed commits.
> * Don't --force a push.
>
> In case you still have problems, then follow this receipt from alexxy.
> He will write some longer instructions soonish in the wiki.
>
> $ git fetch --all (assume that you added github as another upstream.
> origin is g.o.g.o and github is github)
> $ git merge github/master
> $ git push origin
> that will merge github to g.o.g.o
> now we should merge g.o.g.o back to github
> $ git checkout -b github github/master
> $ git merge origin/master
> $ git push github HEAD:master
> $ git checkout master
>
> That should fix our problems.
>
> Justin
>
>

[-- Attachment #2: Type: text/html, Size: 1417 bytes --]

Re: [gentoo-science] Git push problems

[François Bissey]

On 2013-11-08 09:22, justin wrote:
> Hi,
> 
> after talking to our infra guys and alexxy about it, I came to the 
> point
> that we should still allow commits to both repos for everyone with
> commit access.
> 
> To avoid future trouble here are some rules to stick to.
> 
> * Don't _amend_ already pushed commits.
> * Don't _rebase_ already pushed commits.
> * Don't --force a push.
> 
> In case you still have problems, then follow this receipt from alexxy.
> He will write some longer instructions soonish in the wiki.
> 
> $ git fetch --all (assume that you added github as another upstream.
> origin is g.o.g.o and github is github)
> $ git merge github/master
> $ git push origin
> that will merge github to g.o.g.o
> now we should merge g.o.g.o back to github
> $ git checkout -b github github/master
> $ git merge origin/master
> $ git push github HEAD:master
> $ git checkout master
> 
> That should fix our problems.
> 
Thank you Justin for taking the lead on that.
A nice recipe to solve the problem is better than pushing and then
going "bugger now I will have to wait for someone else to fix it".

Francois