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 12:07:29 +0000 Message-ID: <48c054670f70ff7b056a@heytings.org> References: <87v8o0hrk2.fsf@gmx.de> <88f2ba22-64c4-c835-294e-9367766161e5@gmail.com> <87bkprhw7r.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="37518"; 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+ged-emacs-devel=m.gmane-mx.org@gnu.org Tue Nov 01 13:08: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 1opq4B-0009c4-H6 for ged-emacs-devel@m.gmane-mx.org; Tue, 01 Nov 2022 13:08:27 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1opq3K-0003CV-Lq; Tue, 01 Nov 2022 08:07:34 -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 1opq3J-0003CO-JJ for emacs-devel@gnu.org; Tue, 01 Nov 2022 08:07:33 -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 1opq3H-0005Xo-VO for emacs-devel@gnu.org; Tue, 01 Nov 2022 08:07:33 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=heytings.org; s=20220101; t=1667304449; bh=IsKjV2ScrqDWAEhkHjf/uhZU7JCqRUQTS5TpKT0Lcuo=; h=Date:From:To:cc:Subject:In-Reply-To:Message-ID:References:From; b=abj2FM9GPw4/ey1qnv30eQFKvF7O/NR+NUnIO9ry6AVJuSXtNJujdVP3MtdayZ53e tgI6iIMGpAV5YG2Y4xS/1n1l2GkUXeFbcAQhqq6BXNCbNzIpv5H5+mxcdhLSiOrbFY 5UZnw7aZf+/pu5pUM6Mgh64TkTuqyKxslrR6C+98rHcFgomrgdJ9EoMT4BLnRrJSLE nPqMRnp4/WCuxQK9y7cNMSQ0xL8hCAxEak78lYY7ti+h0vjkqEqU7Yon0qUnYk5KlF ZK+j6Lr4bxwdZwED9bgl+VOQMlYq4kMgePtBAGGpgpPsjWMtsbIBX0ymAx/2EXxuUG GpcG/KqABv0+A== In-Reply-To: <87bkprhw7r.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+ged-emacs-devel=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.devel:298931 Archived-At: >> + Depending on what you want to do, it can be helpful to use the option >> + '--first-parent' with 'git bisect', which makes bisect ignore commits >> + coming into a branch from merges. > > I'd rather say 'git start --first-parent'. There's no other bisect > subcommand with that option. > Doing that is wrong, alas. Limiting bisection to first parents will often produce a wrong result. TRT here is to follow Linus' advice, to which I pointed in my other post, namely to manually mark the last commit of the eglot branch before it was merged as "good".