From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Michael Albinus Newsgroups: gmane.emacs.devel Subject: Re: Emacs git repo mangled Date: Sat, 05 Nov 2022 11:54:11 +0100 Message-ID: <87y1spy8mk.fsf@gmx.de> 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> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="19549"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: Gerd =?utf-8?Q?M=C3=B6llmann?= , emacs-devel@gnu.org To: Gregory Heytings Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sat Nov 05 11:55:07 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 1orGpO-0004xV-HW for ged-emacs-devel@m.gmane-mx.org; Sat, 05 Nov 2022 11:55:06 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1orGof-0001kd-VB; Sat, 05 Nov 2022 06:54:21 -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 1orGoe-0001in-1H for emacs-devel@gnu.org; Sat, 05 Nov 2022 06:54:20 -0400 Original-Received: from mout.gmx.net ([212.227.15.18]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1orGob-0005Iy-Mj for emacs-devel@gnu.org; Sat, 05 Nov 2022 06:54:19 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.de; s=s31663417; t=1667645652; bh=zUbJrgKWlqR/1005RbWEUBtKLDGFxncGf/ignAv9x4g=; h=X-UI-Sender-Class:From:To:Cc:Subject:In-Reply-To:References:Date; b=aW/3TpgUCWM5FgAMuO7TqEieLdMVh83OaAYFqGFpF1wXQS/+fY6asj6guGM0+6vzs fTEC1Md6RmBOO1/hEMwq8yGl9xKU6H8Umht2yCm4kLtuV8pQdwK2zAw87yuZcKhrfG kjDUF9P/ZE6GMMC1Fr5nJkEnfbxCNoeZwxYo33d3xYGflMFt3VWxynVxPPqIlOC234 XYoF8+G+fTckmitIq0FdBpdH/um1bzTKDmBRrnSeBFK3+7u/6r90Us6/ehAJkMAHvz T6DyjBseE18YiUPvlAb3N2tEiBq1+V4O+ZyhfkLhS9qf0ms9xt9IQK8QBzz9YssLBg sWy/XNTSrOsEw== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Original-Received: from gandalf.gmx.de ([79.140.118.123]) by mail.gmx.net (mrgmx005 [212.227.17.190]) with ESMTPSA (Nemesis) id 1N17Ye-1p1ph01BNq-012aDj; Sat, 05 Nov 2022 11:54:12 +0100 In-Reply-To: <48c054670fab42fe2218@heytings.org> (Gregory Heytings's message of "Tue, 01 Nov 2022 19:41:41 +0000") X-Provags-ID: V03:K1:HdWkH/+Ees+7e4i0byM5/OpQuAZWRQUryDgoSDQ+cbsywdjvFdF v1Xtm/YexjPVgziF9gl+QDvlOjES6CtE7mXuB2zA7uk+Hh9QP87HboSOuXhsjyiBHvL9Kxo Ag2WtMbTLoPiSbWEAPh5vnPrfw+01omMWqZKZ/Pwp+Ht3Vd+N8FoJBCX3GRIfWokJ/glBnl UZREjHt0gPCMU8hog6p7A== UI-OutboundReport: notjunk:1;M01:P0:U+Fjsx7JNIs=;geJfC4aiqlSX9vyT2RboQimH4fq +TMruGH10blmmEmMGPzSQCL2GiMY2cpALJBJgDUxkcWfgAWkoYXDL6M2uehop0znXCRjJohhs zT58rjdhamGcI88XS/OPfxox+RiZCH7HRC+2hRer9wiv/hpYZUjOS0Zjp1pJA1jw8XxmXSMSv zmlagtD+PKJSv6Ih9JsElgUotCKG2uAY44wlxz9NXBCDlZf6ezXMWAyl/dNYtHpekX/LPv7VV 5J8Zt1Jkg/Q9GsNeESWO0AlI6lZOu0Jo9JM+WW9yYSbhxp8hUcX3FhsGNk7JUPa5LqVl5SQ+j 7QN6X6PpnWWkT2ka3KIadw0vlek4ZyGG8H20vlTT0Cxg/NvEGKs9ztLF5aNMthVrvMFndfTmF fa+pJTr3uAblOoJa95jvbqL/x0vll/1qgTnEV7NMhaFENmIww9+S2uZWY2Cwr2+h9pTgPmdJQ kLv7irgOSgkQFaCygXjgV+47s7F/9hpcavtLme1MADdnocIogxids4wwMTM+nzvkw78Sjs24q QJapWzlV0RIRyDtoBQCt006sn9pWxwWDwwimW07BUyVDJkoQMaXDo457qGLGYVr9yZNCY2Ubn G3FLE5jDkw/hglz/62N3WnqeJt8TpuDmaGsM9bi+i2f9KYc1ilRXvXWI814tbJ2Iv1Nhs2+p7 P4OduIz48zJJmPInsSIysei6FTXAToHHBYyquVwxj959ZYTjnHaOptUNCosrq6CGRpkNpUFVh YTY05KA46/tSg8vPdkttZw+20KT0oNSYugSFmP2lHg7KnkTFKbWz1d3GMqgGKFV7oJfYO5qA Received-SPF: pass client-ip=212.227.15.18; envelope-from=michael.albinus@gmx.de; helo=mout.gmx.net X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=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:299182 Archived-At: Gregory Heytings writes: Hi Gregory, > 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. That doesn't work for me. Test: - Start with current master (8721e87a6ec0874057f83f54498a0e3a64475a53). Everything is clean. --8<---------------cut here---------------start------------->8--- [albinus@gandalf emacs-bisect]$ git status On branch master Your branch is up to date with 'origin/master'. You are currently bisecting, started from branch 'master'. (use "git bisect reset" to get back to the original branch) nothing to commit, working tree clean --8<---------------cut here---------------end--------------->8--- - Start bisecting with the script. --8<---------------cut here---------------start------------->8--- [albinus@gandalf emacs-bisect]$ admin/git-bisect-start Already on 'master' Your branch is up to date with 'origin/master'. status: waiting for both good and bad commits status: waiting for bad commit, 1 good commit known --8<---------------cut here---------------end--------------->8--- - Mark master tip as bad. --8<---------------cut here---------------start------------->8--- [albinus@gandalf emacs-bisect]$ git bisect bad master Bisecting: 80597 revisions left to test after this (roughly 16 steps) [2d7117fe05f034bf2ab796b639041504c4216ac5] (Fx_show_tip): Set string to " " if empty. --8<---------------cut here---------------end--------------->8--- - Mark a commit as good which is before the eglot merge. The idea is to find a bad commit which is also before the eglot merge. --8<---------------cut here---------------start------------->8--- [albinus@gandalf emacs-bisect]$ git bisect good 55c9238189795448075e2d4af93a7b29a505f23c Bisecting: 15456 revisions left to test after this (roughly 14 steps) error: The following untracked working tree files would be overwritten by checkout: doc/misc/modus-themes.texi lisp/cedet/semantic/grammar-wy.el Please move or remove them before you switch branches. Aborting --8<---------------cut here---------------end--------------->8--- Best regards, Michael.