Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cOlbN-00041H-U1 for buildfarm-members@arkaria.postgresql.org; Wed, 04 Jan 2017 13:27:38 +0000 Received: from localhost ([127.0.0.1] helo=postgresql.org) by malur.postgresql.org with smtp (Exim 4.84_2) (envelope-from ) id 1cOlbM-0007vi-V8 for buildfarm-members@arkaria.postgresql.org; Wed, 04 Jan 2017 13:27:36 +0000 Received: from magus.postgresql.org ([2a02:c0:301:0:ffff::29]) by malur.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1cOlbJ-0007sk-VH for buildfarm-members@postgresql.org; Wed, 04 Jan 2017 13:27:34 +0000 Received: from tamriel.snowman.net ([72.66.115.51]) by magus.postgresql.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cOlbD-0004Qn-Vk for buildfarm-members@postgresql.org; Wed, 04 Jan 2017 13:27:33 +0000 Received: by tamriel.snowman.net (Postfix, from userid 1000) id 6B5395F794; Wed, 4 Jan 2017 08:26:26 -0500 (EST) Date: Wed, 4 Jan 2017 08:26:26 -0500 From: Stephen Frost To: Craig Ringer Cc: Andrew Dunstan , Tom Lane , buildfarm-members@postgresql.org, glyn.astill@seetickets.com Subject: Re: git failures Message-ID: <20170104132626.GG18360@tamriel.snowman.net> References: <21316.1483482102@sss.pgh.pa.us> <9f59fc87-2694-f4a3-bd26-66c9d3362e7d@2ndQuadrant.com> <24537.1483493090@sss.pgh.pa.us> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="ttU9AGiyjxxpUEJf" Content-Disposition: inline In-Reply-To: X-Editor: Vim http://www.vim.org/ X-Info: http://www.snowman.net X-Operating-System: Linux/3.13.0-91-generic (x86_64) X-Uptime: 08:26:05 up 179 days, 14:50, 37 users, load average: 0.18, 0.27, 0.24 User-Agent: Mutt/1.5.21 (2010-09-15) X-Pg-Spam-Score: -5.1 (-----) List-Archive: List-Help: List-ID: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: X-Mailing-List: buildfarm-members Precedence: bulk Sender: buildfarm-members-owner@postgresql.org --ttU9AGiyjxxpUEJf Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable * Craig Ringer (craig@2ndquadrant.com) wrote: > On 4 January 2017 at 10:15, Andrew Dunstan > wrote: > > > > > > On 01/03/2017 08:32 PM, Stephen Frost wrote: > >> > >> > >> On Tue, Jan 3, 2017 at 20:25 Tom Lane >> > wrote: > >> > >> Stephen Frost > wri= tes: > >> > >> > I'm hopeful that I fixed it.... > >> > >> > >> > >> For the benefit of the other people with this problem ... what did > >> you do? > >> > >> > >> I did a git pull in the REL9_2_STABLE/pgsql directory and accepted the > >> merge commit message. > >> > >> I'm not convinced that was really the "right" or "correct" thing to do, > >> but it seemed to allow subsequent git pull's without erroring or askin= g for > >> any user interaction. > >> > >> Will look into it more tomorrow. > >> > > > > > > That didn't work for me. I removed that directory altogether, and I exp= ect > > the next buildfarm run to rebuild it cleanly. >=20 > It's definitely not the right thing. >=20 > You should remove the clone, or >=20 > git reset --hard origin/REL9_2_STABLE >=20 > it. Yeah, seems like that was necessary. I've done that now and it seems happier. Thanks! Stephen --ttU9AGiyjxxpUEJf Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBCgAGBQJYbPgCAAoJEO1sijiDR2RVNUEQALN54UV3mKJE/sFOi3VQMaBn bdvQBTYYJBLfqwnkYymPdVEY/smH2k1JKjdzcFoO6yfOW/nz2xzksaG+oMzFCsCM v4PeBTN6voc047SOIUg025EBF5EHKhaHyny7AtiOgb7v+4GR47hVRLuPK8xheavx 83k3wI9psfpmD5WRW5pC2jhG/ZLmpjoqxLslrtGMM8198lvBlgFjq8nwTi8KKn4v FhwYahgH1+03XqZ8OR7x8kWUTvoiGwDxvlZZ5jKX/l3sDbjTZCQQZe6pEooWiyWJ alc9+mLQtf0Q0UnLd1G1uQRCeJ/qG6qygmJoeebYLvwMaIF6GqjzZwTOKNlanCOF MTZ0AiUH1QbgWzSWKyi5UCB8y1YvLskcUbUFEbjk86glw+zXT96CgnQHrUFZTkVE Yt/57V2C1DyXSHijqqcr/AYlrlS8vN4OCo1huVDz4gBwbswPVsDrF1X2oL8Nj1Em JHqd/hqSxuEs4rhm+RkOfVAn1jzDxfnmBouyUYDWP86SDcQFSN3Q93RqqV1ElJcK Yu+MFztysv0HjlpiliEbUcIghFtvxt2THunWMwv741Dde3eB07ehV/T14mMqmMch BIp0XQC9Df3P63+LuVZfvuxyJhtFVUvYu0j7FundmPmBVmVcd//hOR+qx7PMgYky /xtEkLgWlGDg8e/ewkzF =nYUF -----END PGP SIGNATURE----- --ttU9AGiyjxxpUEJf--