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 16:47:57 +0000 Message-ID: <48c054670f81f5613f23@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> Mime-Version: 1.0 Content-Type: text/plain; format=flowed; charset=us-ascii Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="26049"; 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 18:16:11 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 1opurz-0006YF-2w for ged-emacs-devel@m.gmane-mx.org; Tue, 01 Nov 2022 18:16:11 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1opuQv-0000Fn-EZ; Tue, 01 Nov 2022 12:48:13 -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 1opuQt-0000FI-8I for emacs-devel@gnu.org; Tue, 01 Nov 2022 12:48:11 -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 1opuQi-0000sR-4h for emacs-devel@gnu.org; Tue, 01 Nov 2022 12:48:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=heytings.org; s=20220101; t=1667321277; bh=EL/QawCGibIr1sf0HH4oShrDbPF4WXd6aJRSVpk9XfM=; h=Date:From:To:cc:Subject:In-Reply-To:Message-ID:References:From; b=gKNtvDTuAt9d/vnNGiZDfopt0H67ZZ19HYnN8HpBxAnzFQPPRJohtd975lf6rPrtg 0br8Eqo6m9/G7o4oP6GDx/CG0n/nlvJ8YYOZzL/Bk5mbWtk90+WylDCY0HH6KZ+jNf DQohbJ6JzA2Nxk32ifRM9HlKCUIsqZWLv6CGVumy/x75MYvd/KwuRzQUmeKYkYLOII jO0rJMGloebFSbVl/X0ovxTseQcQIW2ySrUq0JyKMGVNS9z1MqhGFqQA//ZMCPkn8g jjpGSEpcXdbxkUDNRQPy87jIgPwAODTOyk3gvZ+Fko+pMW55bymuH9sct0oDsF/7D4 6+OcX0KYiHcFA== In-Reply-To: <8735b2itq8.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:298948 Archived-At: >> By definition, the bad commit cannot be inside the merged Eglot tree, >> because that tree contains only Eglot, not Emacs. The bad commit could >> be the merge commit, but that one is not excluded during the bisection >> if you mark the last commit before the merge as "good". > > That's the eglot case. I was speaking about a merge in general. > Yes, and it's because of merges in general that using --first-parent is not a good idea. >> Perhaps we could maintain a list of such merges somewhere, with the >> commit SHA of the last commit before each merge. Or perhaps even a >> commented script, that would do a "git bisect good ..." for each such >> commit. > > Don't know, I let it to the git aficionados. > 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. Eli, what do you think of adding an admin/git-bisect script to do that? In the future, if other similar merges are done, it would suffice to add another such line in that file.