Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cOdbY-0006hf-C1 for buildfarm-members@arkaria.postgresql.org; Wed, 04 Jan 2017 04:55:16 +0000 Received: from localhost ([127.0.0.1] helo=postgresql.org) by malur.postgresql.org with smtp (Exim 4.84_2) (envelope-from ) id 1cOdbX-0007QN-VA for buildfarm-members@arkaria.postgresql.org; Wed, 04 Jan 2017 04:55:16 +0000 Received: from makus.postgresql.org ([2001:4800:1501:1::229]) by malur.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1cOdbU-0007LQ-R6 for buildfarm-members@postgresql.org; Wed, 04 Jan 2017 04:55:12 +0000 Received: from mail-ua0-x232.google.com ([2607:f8b0:400c:c08::232]) by makus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.84_2) (envelope-from ) id 1cOdbS-0007Bn-5r for buildfarm-members@postgresql.org; Wed, 04 Jan 2017 04:55:11 +0000 Received: by mail-ua0-x232.google.com with SMTP id y9so10338120uae.2 for ; Tue, 03 Jan 2017 20:55:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=2ndquadrant-com.20150623.gappssmtp.com; s=20150623; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=N5D34ZjP2vHDG8Jw3ZfYOQCUXUFBQ7maeyXtwGD/pSg=; b=ii2NecqL4ppaJTNxVQH3zzbt0w9Etb3O7CwyuBGayt0zm/lyzQKVuKn0AHeBu2uAsR ef8TPQl1ROgIVFm0FSIyBLkK4ZL/CarcDnpoyS2nJPxgsDoJZs45gUajMGsWBFnwW3P8 JyXPfGRkcPJOFJ1TQJiBGwJN2kchCPaCpD0pVjjEYApjPz7YjPd1n2Fcm9PUGRN8UhRK WASa8lLUqDxdpKNRxjrJ6kAs8XoWXEeBYVXHVi9f9CM7qipeJLC7s4NsUFEP+659DQdi WftBuSsyiYMbSH5WG+hhJSjyB5lw/TM5htVfSXhhtKTui5fpSWwG2+oKXUeiLLH5/215 t54Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=N5D34ZjP2vHDG8Jw3ZfYOQCUXUFBQ7maeyXtwGD/pSg=; b=W4cpgqxuJ9mpaDY2XR/bYMM7gY8WbJ4yB/aeI4tyfEvSvEuBED7oWvtKExS0tHXaFC lJUmTYomIy4EEZrL7vPlMPAdj04kdwc8QZYjk2IspWy4J94OnMxdofG/GJz7c2biIt/Z nDbt9FjYoprlZn+jQtQHazMtImNflcMI5JGfF/YAySIWhupRVker6Wx5w2wrTpfOW34C BQHlYc0TqGJqznmWPGesRHvcbylN/qNT7e8/RdKGgAYJKb0oRYhhk/7BeJQKJWtVMG8p qWD2/lCSdUbu2Tj+N67tO/vdd9yMLRLu6xh7LmD1GALUH4Hsww5UkW6J9Fy8ZNDS8xoM x6ow== X-Gm-Message-State: AIkVDXIIVkGuy8QgSUGp+tJHHBnz59t2ovtmfrgRylLoos2t+ywgYCOg9N4E3zRvblSnSXMarskYMtTk3+8p5wF4 X-Received: by 10.159.40.194 with SMTP id d60mr48239752uad.122.1483505708923; Tue, 03 Jan 2017 20:55:08 -0800 (PST) MIME-Version: 1.0 Received: by 10.176.80.205 with HTTP; Tue, 3 Jan 2017 20:55:08 -0800 (PST) In-Reply-To: References: <21316.1483482102@sss.pgh.pa.us> <9f59fc87-2694-f4a3-bd26-66c9d3362e7d@2ndQuadrant.com> <24537.1483493090@sss.pgh.pa.us> From: Craig Ringer Date: Wed, 4 Jan 2017 12:55:08 +0800 Message-ID: Subject: Re: git failures To: Andrew Dunstan Cc: Stephen Frost , Tom Lane , buildfarm-members@postgresql.org, glyn.astill@seetickets.com Content-Type: text/plain; charset=UTF-8 X-Pg-Spam-Score: -1.9 (-) 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 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 > writes: >> >> > 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 asking for >> any user interaction. >> >> Will look into it more tomorrow. >> > > > That didn't work for me. I removed that directory altogether, and I expect > the next buildfarm run to rebuild it cleanly. It's definitely not the right thing. You should remove the clone, or git reset --hard origin/REL9_2_STABLE it. -- Craig Ringer http://www.2ndQuadrant.com/ PostgreSQL Development, 24x7 Support, Training & Services -- Sent via buildfarm-members mailing list (buildfarm-members@postgresql.org) To make changes to your subscription: http://www.postgresql.org/mailpref/buildfarm-members