From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Gregory Heytings Newsgroups: gmane.emacs.devel Subject: Re: Emacs git repo mangled Date: Tue, 01 Nov 2022 19:41:41 +0000 Message-ID: <48c054670fab42fe2218@heytings.org> References: <87v8o0hrk2.fsf@gmx.de> <88f2ba22-64c4-c835-294e-9367766161e5@gmail.com> <87bkprhw7r.fsf@gmx.de> <48c054670f70ff7b056a@heytings.org> <877d0eiywf.fsf@gmx.de> <48c054670f6a015a2cca@heytings.org> <8735b2itq8.fsf@gmx.de> <48c054670f81f5613f23@heytings.org> <87o7tqbiqv.fsf@gmx.de> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="8408"; mail-complaints-to="usenet@ciao.gmane.io" Cc: =?UTF-8?Q?Gerd_M=C3=B6llmann?= , emacs-devel@gnu.org To: Michael Albinus Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Tue Nov 01 20:42:28 2022 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1opx9X-0001wy-3O for ged-emacs-devel@m.gmane-mx.org; Tue, 01 Nov 2022 20:42:27 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1opx8t-0001n6-VC; Tue, 01 Nov 2022 15:41:47 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1opx8s-0001mr-0y for emacs-devel@gnu.org; Tue, 01 Nov 2022 15:41:46 -0400 Original-Received: from heytings.org ([95.142.160.155]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1opx8q-0007zw-C3 for emacs-devel@gnu.org; Tue, 01 Nov 2022 15:41:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=heytings.org; s=20220101; t=1667331701; bh=baK5feAkWOrOYOKr48aqFX7yHleNZzrd8C/8909QoUI=; h=Date:From:To:cc:Subject:In-Reply-To:Message-ID:References:From; b=iZ2iZoHz2N0Nob3xc/A46+uFMY6l8/Pj0vgBxg+7npp69YJrLp5aQrONQB0cywY8u 0jDoFE1d5sm5ATQgMkomqDi/xBflL1JYRm+LZtK3ZHKdAjpiYP5wlgi/nAA9Yp2BUe ZAj1iQ7cle0ehGfYTRiqTZbrQMoYfVkVWwPyJu9g00zMFrHMMMFEPciZaSxRRwiCWV k3hbKEIj8oImTXZPMm+2uYurmF4Omie1jgKt71TnU2IFf38sPxDl/tO0i+XEPiPc1s 2dZfZTLs0PR7P20qRbvTllVnXsHSkUN58Jl9NIQuvaatX+7h87qtqdiVTKBEZa/qHJ Zm1mScgx9a+zg== In-Reply-To: <87o7tqbiqv.fsf@gmx.de> Received-SPF: pass client-ip=95.142.160.155; envelope-from=gregory@heytings.org; helo=heytings.org X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: "Emacs-devel" Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.devel:298975 Archived-At: >> Eglot's merge (0186faf2a1) is the first case in Emacs' history in which >> another root commit (1e5b753bf4) was added to the repository. So at the >> moment there is only one such command to type when starting a >> bisection: git bisect good 806734c1b1. > > Wouldn't his mean that all other commits prior the eglot merge would be > regarded as "good", when bisecting? I doubt this is what we want. > No, it means that all commits between Eglot's root (1e5b753bf4) and Eglot's merge (0186faf2a1), except Eglot's merge itself, are regarded as "good". IOW, git bisect will never "descend" into Eglot's branch, and only into that branch, which is exactly what we want.