| 1 |
On Tue, Nov 5, 2013 at 1:42 PM, Justin (jlec) <jlec@g.o> wrote: |
| 2 |
|
| 3 |
> On 05/11/13 21:31, Nicolas Bock wrote: |
| 4 |
> > I have seen the same, but I don't understand what is going on. Why |
| 5 |
> > doesn't a pull on gentoo update anything? |
| 6 |
> |
| 7 |
> see the git push manual -> "NOTE ABOUT FAST-FORWARDS". Most common |
| 8 |
> situation is that someone pushed something and ammended that commit and |
| 9 |
> pushed again. |
| 10 |
> |
| 11 |
> Thanks, that's interesting, didn't know that :) |
| 12 |
|
| 13 |
|
| 14 |
|
| 15 |
> > |
| 16 |
> > |
| 17 |
> > On Tue, Nov 5, 2013 at 1:28 PM, Justin (jlec) <jlec@g.o |
| 18 |
> > <mailto:jlec@g.o>> wrote: |
| 19 |
> > |
| 20 |
> > Hi all. |
| 21 |
> > |
| 22 |
> > I continuously see things like |
| 23 |
> > |
| 24 |
> > $ git ph |
| 25 |
> > Pushing to git@××××××.com:gentoo-science/sci.git |
| 26 |
> > To git@××××××.com:gentoo-science/sci.git |
| 27 |
> > ! [rejected] master -> master (non-fast-forward) |
| 28 |
> > error: failed to push some refs to |
| 29 |
> > 'git@××××××.com:gentoo-science/sci.git' |
| 30 |
> > hint: Updates were rejected because the tip of your current branch |
| 31 |
> > is behind |
| 32 |
> > hint: its remote counterpart. Integrate the remote changes (e.g. |
| 33 |
> > hint: 'git pull ...') before pushing again. |
| 34 |
> > hint: See the 'Note about fast-forwards' in 'git push --help' for |
| 35 |
> > details. |
| 36 |
> > Pushing to git+ssh://git@×××××××××××××××××××.org/proj/sci.git |
| 37 |
> > <http://git@×××××××××××××××××××.org/proj/sci.git> |
| 38 |
> > To git+ssh://git@×××××××××××××××××××.org/proj/sci.git |
| 39 |
> > <http://git@×××××××××××××××××××.org/proj/sci.git> |
| 40 |
> > = [up to date] master -> master |
| 41 |
> > updating local tracking ref 'refs/remotes/origin/master' |
| 42 |
> > Everything up-to-date |
| 43 |
> > |
| 44 |
> > but a git pull doesn't bring anything new. This comes from problems |
| 45 |
> with |
| 46 |
> > fast-forwarding. |
| 47 |
> > |
| 48 |
> > This is my suggestion here, |
| 49 |
> > |
| 50 |
> > We will restrict the push access in gitweb.overlays.gentoo.org |
| 51 |
> > <http://gitweb.overlays.gentoo.org> to a |
| 52 |
> > small group of people (one, two, three official sci team devs) and |
| 53 |
> move |
| 54 |
> > all other contributions over to github. This small team is then |
| 55 |
> > responsible for the merge and shouldn't screw it up. |
| 56 |
> > |
| 57 |
> > What do you think? |
| 58 |
> > |
| 59 |
> > Justin |
| 60 |
> > |
| 61 |
> > |
| 62 |
> |
| 63 |
> |
| 64 |
> |
| 65 |
I am all for it. |
Archives