From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <SRS0=+LvU=6G=mentor.com=joseph_myers@sourceware.org>
Received: from esa1.mentor.iphmx.com (esa1.mentor.iphmx.com [68.232.129.153])
	by sourceware.org (Postfix) with ESMTPS id 0B4B8388456D
	for <libc-alpha@sourceware.org>; Fri, 10 Feb 2023 21:56:17 +0000 (GMT)
DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0B4B8388456D
Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=codesourcery.com
Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=mentor.com
X-IronPort-AV: E=Sophos;i="5.97,287,1669104000"; 
   d="scan'208";a="100365133"
Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165])
  by esa1.mentor.iphmx.com with ESMTP; 10 Feb 2023 13:56:16 -0800
IronPort-SDR: aVqMJYpXDcheOQFvyQlnmNE2yPoYh90qzpgJmEFSjr4tHJUheqU6zSRYLIeJhEw7N6NpB7OW6I
 wkfVuP6Q8VZ44nu7MrvdaJiOgcHMELL4soPZJjTksBgaJ3g9BCRU+XNHSNLOyCyE9Vy6hgnw+E
 0gLGJuVYILnGl04SpBD51br08jbJaXzJhB/nUKpIR1buLLcRF8IBWYrdOyjp6I3uSn8L2aOEl1
 u8PsthOqnZRHt9tEFtoxBaPtGKnA0WcwgXKMcc7l+JrLAlkZawk2LU8yny9/jfEMMjXf/zJ7py
 xFE=
Date: Fri, 10 Feb 2023 21:56:13 +0000
From: Joseph Myers <joseph@codesourcery.com>
To: Paul Pluzhnikov <ppluzhnikov@google.com>
CC: Andreas Schwab <schwab@linux-m68k.org>, Paul Pluzhnikov via Libc-alpha
	<libc-alpha@sourceware.org>
Subject: Re: [committed][PATCH] Use __builtin_FILE instead of __FILE__ in
 assert in C++.
In-Reply-To: <CALoOobNszYd4=NQpO5tyvqeiMZ=KzG19Z_oh8sg_qEUT+O-LFA@mail.gmail.com>
Message-ID: <9030e0a4-4178-6d0-efee-dd736137cab4@codesourcery.com>
References: <20230210162626.3097660-1-ppluzhnikov@google.com> <87mt5lo3nm.fsf@igel.home> <CALoOobNszYd4=NQpO5tyvqeiMZ=KzG19Z_oh8sg_qEUT+O-LFA@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="US-ASCII"
X-Originating-IP: [137.202.0.90]
X-ClientProxiedBy: svr-ies-mbx-11.mgc.mentorg.com (139.181.222.11) To
 svr-ies-mbx-10.mgc.mentorg.com (139.181.222.10)
X-Spam-Status: No, score=-3108.4 required=5.0 tests=BAYES_00,HEADER_FROM_DIFFERENT_DOMAINS,KAM_DMARC_STATUS,SPF_HELO_PASS,SPF_PASS,TXREP autolearn=no autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org
List-Id: <libc-alpha.sourceware.org>

On Fri, 10 Feb 2023, Paul Pluzhnikov via Libc-alpha wrote:

> I was able to push amended patch (since there were no newer commits).
> Is that what I should have done?

No, you should never do non-fast-forward pushes to master or other shared 
branches.  Carlos, could you investigate why the allow-non-fast-forward = 
(?!master|release.*) setting wasn't working to prevent such a push?  Is 
the setting being matched against full ref names and so considering 
refs/heads/master to match (?!master|release.*)?

-- 
Joseph S. Myers
joseph@codesourcery.com