From: Nicolas Bock <nicolasbock@gmail.com>
To: gentoo-science@lists.gentoo.org
Subject: Re: [gentoo-science] Git push problems
Date: Tue, 5 Nov 2013 13:48:16 -0700 [thread overview]
Message-ID: <CAPMKG4DrWZxwykUn5tL+j-U++NMEKzD_RaZjiWt2=4azBf-Dhw@mail.gmail.com> (raw)
In-Reply-To: <52795831.1070005@gentoo.org>
[-- 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 --]
next prev parent reply other threads:[~2013-11-05 20:49 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-05 20:28 [gentoo-science] Git push problems Justin (jlec)
2013-11-05 20:31 ` Nicolas Bock
2013-11-05 20:42 ` Justin (jlec)
2013-11-05 20:48 ` Nicolas Bock [this message]
2013-11-05 20:33 ` Christoph Junghans
2013-11-07 20:22 ` justin
2013-11-07 20:34 ` Nicolas Bock
2013-11-07 20:35 ` François Bissey
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAPMKG4DrWZxwykUn5tL+j-U++NMEKzD_RaZjiWt2=4azBf-Dhw@mail.gmail.com' \
--to=nicolasbock@gmail.com \
--cc=gentoo-science@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox