From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 91CCB138247 for ; Tue, 5 Nov 2013 20:29:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A74C0E08D9; Tue, 5 Nov 2013 20:29:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 15522E084A for ; Tue, 5 Nov 2013 20:29:01 +0000 (UTC) Received: from leo.jlec.de (vpn-c2.not-your-server.de [IPv6:2a01:4f8:191:22ca::2:1002]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: jlec) by smtp.gentoo.org (Postfix) with ESMTPSA id C071733EEE2; Tue, 5 Nov 2013 20:28:59 +0000 (UTC) Message-ID: <52795508.3030803@gentoo.org> Date: Tue, 05 Nov 2013 21:28:56 +0100 From: "Justin (jlec)" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.0 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-science@lists.gentoo.org Reply-to: gentoo-science@lists.gentoo.org MIME-Version: 1.0 To: Gentoo Science mailinglist Subject: [gentoo-science] Git push problems X-Enigmail-Version: 1.5.2 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="LiUI80MKFgUcOB59gxWeKlVlHn01crdWj" X-Archives-Salt: dd62410c-1059-4c8b-aa0c-256c1e0b319f X-Archives-Hash: 2e8bbbf3db1c92779b96a44e072d30d0 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --LiUI80MKFgUcOB59gxWeKlVlHn01crdWj Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable 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 beh= ind 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= =2E Pushing to git+ssh://git@git.overlays.gentoo.org/proj/sci.git To git+ssh://git@git.overlays.gentoo.org/proj/sci.git =3D [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 --LiUI80MKFgUcOB59gxWeKlVlHn01crdWj Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBCgAGBQJSeVUIAAoJELnU8jG9FVirgLQP/i02vq90NZ/0mbHYuDiDcgfI Ucmt0VwLJ+yf1RAW8ZrAoL7o6jePXYrjAtJ7vpH5Oc4Wg3fmwWb+dkIuGlW6WAcV 81sK1aolfX26u0bK9VQ1Hf+mQgsvLDqFkJZHOa/4hMPr2ON5TTG+DWPyO3GGwEzb C4pvpsWVXJHgOiWwc0bHE2CMIu+vTdAkHLmjq2f1Gk/TE4yqL83G/UbqWcSzgbcD BBE+LIZ3O7E2Uustc3Rs4SzAKyD7dw+UYxip+THCEgMQs5vxPGD6Gqn6E0bSj5C1 b/fbRN1f2/cPCB/vonTshQ/tFjCTkhJb3LFnxMitbIWne8/2xoUY3PIbzxUew33+ GHMyhkiXmqQL0Ioe+WoOF46SZYEL6qQkD0yEpRQnX7xU/0mBhI8eedO/GAqoEoPT pwl8xnCFcIXRth+Sg3uSG+d0JPiPPjyu2rZGLR2s/BMU4vI9duAXC+I00i908Jx+ FC2/eC1eunFmEcG6OvK6uQt2Yekj7EzJe0dWQ//e9aWKaUEBO+tXzYlfntV5yZOr P9bj/zlA/XXk4nT/y76TCaOArfeIyWpreDTDLCJLBfLWf/R5uLxwMPgaDCLv39Na SDeVjQXun6muaniqAXW4R8LLnGVEy/cGARRF/EF+flZeOoR/irW5jkZww7EoV6q+ O6XaLfeg5r0/fxIx4Wa6 =AdSr -----END PGP SIGNATURE----- --LiUI80MKFgUcOB59gxWeKlVlHn01crdWj--