From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id VZeVAo2kYmCuXAAAWB0awg (envelope-from ) for ; Tue, 30 Mar 2021 00:09:49 -0400 Received: by simark.ca (Postfix, from userid 112) id F00721EE0E; Tue, 30 Mar 2021 00:09:48 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-0.6 required=5.0 tests=MAILING_LIST_MULTI, RDNS_DYNAMIC,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (ip-8-43-85-97.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 261401E783 for ; Tue, 30 Mar 2021 00:09:48 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id CD5743861010; Tue, 30 Mar 2021 04:09:46 +0000 (GMT) Received: from rock.gnat.com (rock.gnat.com [205.232.38.15]) by sourceware.org (Postfix) with ESMTP id 7DB1F3858002; Tue, 30 Mar 2021 04:09:44 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 7DB1F3858002 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=brobecker@adacore.com Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id 3F7FC1169B6; Tue, 30 Mar 2021 00:09:44 -0400 (EDT) X-Virus-Scanned: Debian amavisd-new at gnat.com Received: from rock.gnat.com ([127.0.0.1]) by localhost (rock.gnat.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id pAZHzHtf9YGB; Tue, 30 Mar 2021 00:09:44 -0400 (EDT) Received: from float.home (localhost.localdomain [127.0.0.1]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by rock.gnat.com (Postfix) with ESMTPS id C6D161169AA; Tue, 30 Mar 2021 00:09:43 -0400 (EDT) Received: by float.home (Postfix, from userid 1000) id 1EF77A1242; Tue, 30 Mar 2021 08:09:39 +0400 (+04) Date: Tue, 30 Mar 2021 08:09:39 +0400 From: Joel Brobecker To: Martin =?utf-8?B?TGnFoWth?= Subject: Re: Please enable fast forward for user branches Message-ID: <20210330040939.GC11111@adacore.com> References: <1af95023-580d-6774-c307-1a38bf3dc073@suse.cz> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1af95023-580d-6774-c307-1a38bf3dc073@suse.cz> X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Binutils , gdb-patches@sourceware.org Errors-To: gdb-patches-bounces@sourceware.org Sender: "Gdb-patches" Hello, > I would like to sync up my binutils user branches to the primary server. > However, I can't do rebases which makes it not usable at all: > > $ git push origin me/startswith -f > Enumerating objects: 257, done. > Counting objects: 100% (257/257), done. > Delta compression using up to 16 threads > Compressing objects: 100% (140/140), done. > Writing objects: 100% (140/140), 22.31 KiB | 951.00 KiB/s, done. > Total 140 (delta 134), reused 0 (delta 0), pack-reused 0 > remote: Resolving deltas: 100% (134/134), completed with 117 local objects. > remote: error: denying non-fast-forward refs/heads/users/marxin/startswith (you should pull first) > To ssh://sourceware.org/git/binutils-gdb.git > ! [remote rejected] me/startswith -> users/marxin/startswith (non-fast-forward) > error: failed to push some refs to 'ssh://sourceware.org/git/binutils-gdb.git' I think the error above comes from Git itself, and is related to the configuration of the repository. In particular, I found that our binutils-gdb repository's configuration has: | [receive] | denynonfastforwards = true Not sure what the history of this is. In the meantime, I've modified the git-hooks configuration so that, if the above is lifted, users will be allowed to do non-fast-forward updates on users/.* branches. -- Joel