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:26:41 +0000 Message-ID: References: <48c054670f270d7d94b8@heytings.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="GuqtMyj1VM" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="27939"; mail-complaints-to="usenet@ciao.gmane.io" Cc: eliz@gnu.org, emacs-devel@gnu.org, michael.albinus@gmx.de To: =?UTF-8?Q?Gerd_M=C3=B6llmann?= Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Wed Nov 02 10:27:31 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 1oqA1y-000718-UU for ged-emacs-devel@m.gmane-mx.org; Wed, 02 Nov 2022 10:27:31 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oqA1H-000098-VK; Wed, 02 Nov 2022 05:26:48 -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 1oqA1G-00007o-0M for emacs-devel@gnu.org; Wed, 02 Nov 2022 05:26: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 1oqA1E-0007YX-9i; Wed, 02 Nov 2022 05:26:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=heytings.org; s=20220101; t=1667381201; bh=1M9lSyUqjzpwPnHD1USIMDsIF93lMJdJ3GiwHBADFxo=; h=Date:From:To:cc:Subject:In-Reply-To:Message-ID:References:From; b=kPd4t8SJgtbRPQsPQIFLb/Uy4l07+GeFYqoRt8jJaKdO9IqjHeMpyBPsOAMzUah4T Nj4cmInvXRVaCSNvvoTY5bteLlOV/tKIQx6oD5kho6FOEoXJhdcqc0vFGKOvKrLCmv LIckl0GEExQ52yYHAjgSFuUCOG327/8L+HtrtZ7q9Mc0Ew8Hne5FYQ8hpib4lV/kkz 83DCPiBS3qBGLvtEXtQvfCVN89ckAgO9lIACDIqEzGpETkd7suNgbNPi008L04e6u8 N8zfrQGA62icpxOTyS+CqEki9PsJ8K5jIj4PfvMRvOarY8rsxsr+Rt3ejFmcW0pG5B 1zbNdOtFipCdw== In-Reply-To: Content-ID: 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:298998 Archived-At: --GuqtMyj1VM Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Content-ID: > > I'm not opposing anything, but I wonder if mentioning of --first-parent= =20 > somewhere might be useful to others, because I find it pretty useful. > > This is why I am using it, all the time so far, in Emacs, which is=20 > admittedly a small sample size: > > We have master with frequent merges from emacs-28. If I know that a=20 > problem exists in master, but not in emacs-28, or if I suspect that is=20 > the case, I don't want to waste time checking commits incoming from=20 > emacs-28. > > You have to know what you're doing, as always, and YMMV, and blahblah. > =F0=9F=98=89 I think the --first-parent is doing too much for your use case= , because=20 it will also skip other merges that are not from emacs-28. Moreover git=20 bisect is "fast", in a typical bisection only a few commits are checked.=20 So I don't think that excluding merge branches without being 110% certain= =20 that the bad commit is not in these branches is a good idea. That being=20 said, I'm of course not against mentioning --first-parent either. --GuqtMyj1VM--