From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-science+bounces-1865-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 35A81138247
for <garchives@archives.gentoo.org>; Tue, 5 Nov 2013 20:49:04 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 3E578E094F;
Tue, 5 Nov 2013 20:48:58 +0000 (UTC)
Received: from mail-ob0-f177.google.com (mail-ob0-f177.google.com [209.85.214.177])
(using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 98BCCE0949
for <gentoo-science@lists.gentoo.org>; Tue, 5 Nov 2013 20:48:57 +0000 (UTC)
Received: by mail-ob0-f177.google.com with SMTP id vb8so9048142obc.22
for <gentoo-science@lists.gentoo.org>; Tue, 05 Nov 2013 12:48:56 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20120113;
h=mime-version:in-reply-to:references:from:date:message-id:subject:to
:content-type;
bh=DMCJ8zaErmK6N/107Haljbe1UeJH2ySo/jFw/izPSlA=;
b=ZteYhbut9Vl26xFh6lb/R54T0fHKydMbXQrh7wKmGKZteBL58Cg8b1mWX4rbEEBKu7
APn51b42+gXf28RrA5KhtpnvZEI3pNoQToAcxzWcURqXGFLc2qyRSZ3+yfa/Z9n8kFIJ
bXym6eNfu87v/Ar0wqqwxhfbDOOn9RQ8ljXVFb8f3N4ziUsi0lyH8Y54phQs4ovI9RC3
ABQ2PFICi/C7b2vLeCgU8Ad6gsadVTlQuCKYoDB0aUGXMPsX1MUFXW4IMrTqb9+1CmgU
oOXucaLk8KSKkJVtZg2XzAesLq8Wwa9nKzbqK0FlCYItziqlEkFAePnMAchTyQwI8gmd
S2vg==
X-Received: by 10.60.99.71 with SMTP id eo7mr2220730oeb.61.1383684536674; Tue,
05 Nov 2013 12:48:56 -0800 (PST)
Precedence: bulk
List-Post: <mailto:gentoo-science@lists.gentoo.org>
List-Help: <mailto:gentoo-science+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-science+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-science+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-science.gentoo.org>
X-BeenThere: gentoo-science@lists.gentoo.org
Reply-to: gentoo-science@lists.gentoo.org
MIME-Version: 1.0
Received: by 10.182.118.66 with HTTP; Tue, 5 Nov 2013 12:48:16 -0800 (PST)
In-Reply-To: <52795831.1070005@gentoo.org>
References: <52795508.3030803@gentoo.org> <CAPMKG4CpXAoJ-wRfN0TQhVRuVcW6A+YaN6yrFKFV+bNAVnjuJA@mail.gmail.com>
<52795831.1070005@gentoo.org>
From: Nicolas Bock <nicolasbock@gmail.com>
Date: Tue, 5 Nov 2013 13:48:16 -0700
Message-ID: <CAPMKG4DrWZxwykUn5tL+j-U++NMEKzD_RaZjiWt2=4azBf-Dhw@mail.gmail.com>
Subject: Re: [gentoo-science] Git push problems
To: gentoo-science@lists.gentoo.org
Content-Type: multipart/alternative; boundary=047d7b33d4144a301f04ea7429b8
X-Archives-Salt: 405453d0-9aac-4993-a10b-0277fda87a7d
X-Archives-Hash: dcc26cd34d18d6cc78327cce2e7eeee0
--047d7b33d4144a301f04ea7429b8
Content-Type: text/plain; charset=UTF-8
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.
--047d7b33d4144a301f04ea7429b8
Content-Type: text/html; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
<div dir=3D"ltr"><div>On Tue, Nov 5, 2013 at 1:42 PM, Justin (jlec) <span d=
ir=3D"ltr"><<a href=3D"mailto:jlec@gentoo.org" target=3D"_blank">jlec@ge=
ntoo.org</a>></span> wrote:<br></div><div class=3D"gmail_extra"><div cla=
ss=3D"gmail_quote">
<blockquote class=3D"gmail_quote" style=3D"margin:0px 0px 0px 0.8ex;border-=
left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;p=
adding-left:1ex"><div class=3D"im">On 05/11/13 21:31, Nicolas Bock wrote:<b=
r>
> I have seen the same, but I don't understand what is going on. Why=
<br>
> doesn't a pull on gentoo update anything?<br>
<br>
</div>see the git push manual -> "NOTE ABOUT FAST-FORWARDS". M=
ost common<br>
situation is that someone pushed something and ammended that commit and<br>
pushed again.<br>
<div class=3D"im"><br></div></blockquote>Thanks, that's interesting, di=
dn't know that :)<div><br></div><div>=C2=A0</div><blockquote class=3D"g=
mail_quote" style=3D"margin:0px 0px 0px 0.8ex;border-left-width:1px;border-=
left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">
<div class=3D"im">
><br>
><br>
> On Tue, Nov 5, 2013 at 1:28 PM, Justin (jlec) <<a href=3D"mailto:jl=
ec@gentoo.org">jlec@gentoo.org</a><br>
</div><div class=3D"im">> <mailto:<a href=3D"mailto:jlec@gentoo.org">=
jlec@gentoo.org</a>>> wrote:<br>
><br>
> =C2=A0 =C2=A0 Hi all.<br>
><br>
> =C2=A0 =C2=A0 I continuously see things like<br>
><br>
> =C2=A0 =C2=A0 =C2=A0$ git ph<br>
> =C2=A0 =C2=A0 Pushing to git@github.com:gentoo-science/sci.git<br>
> =C2=A0 =C2=A0 To git@github.com:gentoo-science/sci.git<br>
> =C2=A0 =C2=A0 =C2=A0! [rejected] =C2=A0 =C2=A0 =C2=A0 =C2=A0master -&g=
t; master (non-fast-forward)<br>
> =C2=A0 =C2=A0 error: failed to push some refs to<br>
> =C2=A0 =C2=A0 'git@github.com:gentoo-science/sci.git'<br>
> =C2=A0 =C2=A0 hint: Updates were rejected because the tip of your curr=
ent branch<br>
> =C2=A0 =C2=A0 is behind<br>
> =C2=A0 =C2=A0 hint: its remote counterpart. Integrate the remote chang=
es (e.g.<br>
> =C2=A0 =C2=A0 hint: 'git pull ...') before pushing again.<br>
> =C2=A0 =C2=A0 hint: See the 'Note about fast-forwards' in '=
;git push --help' for<br>
> =C2=A0 =C2=A0 details.<br>
> =C2=A0 =C2=A0 Pushing to git+ssh://<a href=3D"http://git@git.overlays.=
gentoo.org/proj/sci.git" target=3D"_blank">git@git.overlays.gentoo.org/proj=
/sci.git</a><br>
</div>> =C2=A0 =C2=A0 <<a href=3D"http://git@git.overlays.gentoo.org/=
proj/sci.git" target=3D"_blank">http://git@git.overlays.gentoo.org/proj/sci=
.git</a>><br>
> =C2=A0 =C2=A0 To git+ssh://<a href=3D"http://git@git.overlays.gentoo.o=
rg/proj/sci.git" target=3D"_blank">git@git.overlays.gentoo.org/proj/sci.git=
</a><br>
> =C2=A0 =C2=A0 <<a href=3D"http://git@git.overlays.gentoo.org/proj/s=
ci.git" target=3D"_blank">http://git@git.overlays.gentoo.org/proj/sci.git</=
a>><br>
<div class=3D"im">> =C2=A0 =C2=A0 =C2=A0=3D [up to date] =C2=A0 =C2=A0 =
=C2=A0master -> master<br>
> =C2=A0 =C2=A0 updating local tracking ref 'refs/remotes/origin/mas=
ter'<br>
> =C2=A0 =C2=A0 Everything up-to-date<br>
><br>
> =C2=A0 =C2=A0 but a git pull doesn't bring anything new. This come=
s from problems with<br>
> =C2=A0 =C2=A0 fast-forwarding.<br>
><br>
> =C2=A0 =C2=A0 This is my suggestion here,<br>
><br>
> =C2=A0 =C2=A0 We will restrict the push access in <a href=3D"http://gi=
tweb.overlays.gentoo.org" target=3D"_blank">gitweb.overlays.gentoo.org</a><=
br>
</div>> =C2=A0 =C2=A0 <<a href=3D"http://gitweb.overlays.gentoo.org" =
target=3D"_blank">http://gitweb.overlays.gentoo.org</a>> to a<br>
<div class=3D""><div class=3D"h5">> =C2=A0 =C2=A0 small group of people =
(one, two, three official sci team devs) and move<br>
> =C2=A0 =C2=A0 all other contributions over to github. This small team =
is then<br>
> =C2=A0 =C2=A0 responsible for the merge and shouldn't screw it up.=
<br>
><br>
> =C2=A0 =C2=A0 What do you think?<br>
><br>
> =C2=A0 =C2=A0 Justin<br>
><br>
><br>
<br>
<br>
</div></div></blockquote></div><br></div><div class=3D"gmail_extra">I am al=
l for it.</div><div class=3D"gmail_extra"><br></div></div>
--047d7b33d4144a301f04ea7429b8--