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: Tue, 01 Nov 2022 14:32:00 +0100 Message-ID: <877d0eiywf.fsf@gmx.de> References: <87v8o0hrk2.fsf@gmx.de> <88f2ba22-64c4-c835-294e-9367766161e5@gmail.com> <87bkprhw7r.fsf@gmx.de> <48c054670f70ff7b056a@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="24715"; 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 Tue Nov 01 18:30:23 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 1opv5i-00068E-Jz for ged-emacs-devel@m.gmane-mx.org; Tue, 01 Nov 2022 18:30:22 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oprNE-0001f6-1K; Tue, 01 Nov 2022 09:32:15 -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 1oprN9-0001ec-Un for emacs-devel@gnu.org; Tue, 01 Nov 2022 09:32:08 -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 1oprN7-0001Wu-QV for emacs-devel@gnu.org; Tue, 01 Nov 2022 09:32:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.de; s=s31663417; t=1667309522; bh=90Q/SLUSk5BHinygpnJ23pDvuCLQwWgbd5wm0+07Y7M=; h=X-UI-Sender-Class:From:To:Cc:Subject:In-Reply-To:References:Date; b=VPSsfxXY0kaRmhhd4DfS91xXrKbDlFXOFoTnGJj1auD1fzPjlhkCz0XMNuE1Q/yh1 O+EAXLUotjY4JyhOvkfJkOYA2kzd0RetApvi2SZ2p4T8L3NNqpvYCckMiPshNpmE1v b0t+mdBtA8Zmt6G/g4OSDGc+4UeZD0slkt+ONEsUMhMOEuunBDynWQqO/arzKbtQp2 8g5rtlJ/h4qdRvT8nlIeqYATlXXEQoB3Hf5uYJb1poaO58Q7PlLKyaP3GpReQq0UUn dxc9Tg6YUAWv7CRI1MbmW4DeLkfDRW6xbBiCNIcyyH5ckSgr5eLn0XXnMJqDdvp4h7 iIqB8hAhl67Sg== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Original-Received: from gandalf.gmx.de ([79.140.125.69]) by mail.gmx.net (mrgmx005 [212.227.17.190]) with ESMTPSA (Nemesis) id 1Mkpav-1pJzKw3oGV-00mHdC; Tue, 01 Nov 2022 14:32:02 +0100 In-Reply-To: <48c054670f70ff7b056a@heytings.org> (Gregory Heytings's message of "Tue, 01 Nov 2022 12:07:29 +0000") X-Provags-ID: V03:K1:9lOac3q0JPxWgmCgob/5k2KzbumHbqUyt0QBm6aETQCXkjlOnxG meEJ+qF2J5E46lkqDPp48vQ1jMWR/3ffJ/037Y2l1OG+Zz4rwLteswR5KRJ2lLiYpMw4uPF BUAs48HiEZfQCcJdxZYHNgFO7y+QISKNPGLd/SrKSGQKfLMnHFuQtRn3U3RTZPp23LkMobP BQLSEB3rC/MpYD7hyTnJg== UI-OutboundReport: notjunk:1;M01:P0:e1v6z3iB7uE=;XRut4F8ktpE8XOldPtHT2KU+td/ K86vD4bVHTIsT7zikcSRzdNHpO1ZroOjtjEnZvAuABnf2uijQaDpUR2x5XBRdNR213hS11aeo ylVbpVOXvAt8D5mgK3yAacAFUmhBlV2yQzUWgBSgszbb7sI558+DZbT7WGEleKmx4fS4p4/Rg 1IuMnIlZP6UOevxFJRTHX7S5czczAJZUrzfOr8edXg6G9M9MXkE6onehkaBXPQ0tEMGwdbH6q 4BLS9vx1H9VGF9bMuXTkouPdLx+Oh4nk/9AETpGQKUdWpQmUDXOxYU28k0AZJ8UjoIt0yerip EdCdMg6dbDuT+zFUy2bA/3SIJEkPTQu+3U690sp2GnLMeWx7HmLkPwa+5SV8fZXSMjK8WbcwF rc9r+7l1+4hA3qLs79+Kmn63/tAIV5l2OZGe30mD5aO68sBfAOtUF1G2cBh8zGvYCeREOifbU LfFoDZEXEYIN+s1kDhAByiRlihT7/8XsMRs/mxzZh+ip4WcUdPmha92cjYJKsiRe+l/1gxyy7 YbN+gkBqFw+Pzs1flr9X3WvlSeOT307FeVXceufVtYgfi331fVal3MZWLE8CsN0Q+PBEV8ffv Qm+XqcLjWJLnDU/zRs5FAcvgehHPQa3sh5xlZbB8cYABw3n+A2zcbpFbLM02YwTPP0H8OHsae csgvzIHY1JNdetXo4V3uNjixfOT/sjUrk4TAWiZizS+ZeUwcCaP29KDdN1/TsOzQNxNRqoGmo 3lgw3R6Hnfor4rMYKm7OtQCwjLZgqbOu/Gd8A6b6W1bLWfd/Hr/UunlPJnMfwgoo7XVVqTW7 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:298962 Archived-At: Gregory Heytings writes: Hi Gregory, >>> + 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". This approach would raise other problems. - You might not know that you are in a merged subtree. It took me two days until I realized this (hmm, this could mean I'm too stupid). - If the bad commit is inside the merge, you won't see it, because you have marked the whole merged subtree as good (by marking the last commit of the merged subtree). - It would require manual actions, because first you need to determine the range of the merged subtree in order to mark last commit of this. Best regards, Michael.