Gentoo Archives: gentoo-science

From: Christoph Junghans <ottxor@g.o>
To: gentoo-science@l.g.o
Subject: Re: [gentoo-science] Git push problems
Date: Tue, 05 Nov 2013 20:33:47
Message-Id: CANgp9kwPMZ8U2T_=8J2qzcPiL4aeC=+pzYmFOQXUZYPradNYvA@mail.gmail.com
In Reply to: [gentoo-science] Git push problems by "Justin (jlec)"
1 2013/11/5 Justin (jlec) <jlec@g.o>:
2 > Hi all.
3 >
4 > I continuously see things like
5 >
6 > $ git ph
7 > Pushing to git@××××××.com:gentoo-science/sci.git
8 > To git@××××××.com:gentoo-science/sci.git
9 > ! [rejected] master -> master (non-fast-forward)
10 > error: failed to push some refs to 'git@××××××.com:gentoo-science/sci.git'
11 > hint: Updates were rejected because the tip of your current branch is behind
12 > hint: its remote counterpart. Integrate the remote changes (e.g.
13 > hint: 'git pull ...') before pushing again.
14 > hint: See the 'Note about fast-forwards' in 'git push --help' for details.
15 > Pushing to git+ssh://git@×××××××××××××××××××.org/proj/sci.git
16 > To git+ssh://git@×××××××××××××××××××.org/proj/sci.git
17 > = [up to date] master -> master
18 > updating local tracking ref 'refs/remotes/origin/master'
19 > Everything up-to-date
20 >
21 > but a git pull doesn't bring anything new. This comes from problems with
22 > fast-forwarding.
23 >
24 > This is my suggestion here,
25 >
26 > We will restrict the push access in gitweb.overlays.gentoo.org to a
27 > small group of people (one, two, three official sci team devs) and move
28 > all other contributions over to github. This small team is then
29 > responsible for the merge and shouldn't screw it up.
30 >
31 > What do you think?
32 +1
33
34 >
35 > Justin
36 >
37
38
39
40 --
41 Christoph Junghans
42 http://dev.gentoo.org/~ottxor/