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: Wed, 02 Nov 2022 09:14:32 +0000 Message-ID: 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> <48c054670fab42fe2218@heytings.org> <83h6ziavf8.fsf@gnu.org> 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="7455"; mail-complaints-to="usenet@ciao.gmane.io" Cc: michael.albinus@gmx.de, gerd.moellmann@gmail.com, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Wed Nov 02 10:15:58 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 1oq9qn-0001iE-Gl for ged-emacs-devel@m.gmane-mx.org; Wed, 02 Nov 2022 10:15:57 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oq9pk-0003Vl-Kl; Wed, 02 Nov 2022 05:14:52 -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 1oq9pi-0003V3-7V for emacs-devel@gnu.org; Wed, 02 Nov 2022 05:14:50 -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 1oq9pW-0001ib-Ao; Wed, 02 Nov 2022 05:14:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=heytings.org; s=20220101; t=1667380472; bh=9TASJAIQtTqXYERFB/fpE1PocC7lj4IVblEw4r0UL54=; h=Date:From:To:cc:Subject:In-Reply-To:Message-ID:References:From; b=VePZhtaJPnuB/zpyVCzRmeLaQbidv3vrecnb1aByC6/IQETCgtA9yyxwgj6Smr8r5 C/FMgxRVGKYaufG3ZqQrSD+FvHe+Ku5huxFblKSkGvd52Tfw2PY1CBhYkEe50zfvTl gNKjooLoTgGe3Lv+tV4dl1M3iIhYSqHr6pyojwhJ4cLPncngeSlSf2JvFhuz9N6YVO nkubAfJbVTYQZJ1m+oAtFROofAM74+fNsrqQbKreN96fF7Xj0s4bN0qchXWVmUJubh V4oPRPBVdwwXl8IvSPh0v+cBVGTZ7mz0gHpQDCQMRCre0BIjpugewPbA4q0lmtUf+R RwqUmsklLplDA== In-Reply-To: <83h6ziavf8.fsf@gnu.org> 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:298997 Archived-At: >>> 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. > > IMO, this interpretation should be in the comments inside the script. > It is: # Start a git bisection, and prune the branches that are the result of # merging external trees into the Emacs repository. [...] # Prune commits 1e5b753bf4..806734c1b1 introduced by 0186faf2a1 (Eglot # merge on Oct 20 2022) git bisect good 806734c1b1