From: Michael Albinus <michael.albinus@gmx.de>
To: Gregory Heytings <gregory@heytings.org>
Cc: "Gerd Möllmann" <gerd.moellmann@gmail.com>, emacs-devel@gnu.org
Subject: Re: Emacs git repo mangled
Date: Sat, 05 Nov 2022 11:54:11 +0100 [thread overview]
Message-ID: <87y1spy8mk.fsf@gmx.de> (raw)
In-Reply-To: <48c054670fab42fe2218@heytings.org> (Gregory Heytings's message of "Tue, 01 Nov 2022 19:41:41 +0000")
Gregory Heytings <gregory@heytings.org> 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.
next prev parent reply other threads:[~2022-11-05 10:54 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-31 9:50 Emacs git repo mangled Michael Albinus
2022-10-31 13:09 ` Gerd Möllmann
2022-10-31 16:43 ` Michael Albinus
2022-11-01 5:44 ` Gerd Möllmann
2022-11-01 9:15 ` Michael Albinus
2022-11-01 9:28 ` Gerd Möllmann
2022-11-01 12:07 ` Gregory Heytings
2022-11-01 13:32 ` Michael Albinus
2022-11-01 13:55 ` Gregory Heytings
2022-11-01 15:23 ` Michael Albinus
2022-11-01 16:47 ` Gregory Heytings
2022-11-01 17:19 ` Eli Zaretskii
2022-11-01 18:25 ` Gregory Heytings
2022-11-02 5:51 ` Gerd Möllmann
2022-11-02 9:26 ` Gregory Heytings
2022-11-01 19:02 ` Michael Albinus
2022-11-01 19:41 ` Gregory Heytings
2022-11-02 3:26 ` Eli Zaretskii
2022-11-02 9:14 ` Gregory Heytings
2022-11-02 12:59 ` Phil Sainty
2022-11-02 13:10 ` Gregory Heytings
2022-11-02 13:49 ` Eli Zaretskii
2022-11-02 14:27 ` Gregory Heytings
2022-11-05 10:54 ` Michael Albinus [this message]
2022-11-05 21:58 ` Gregory Heytings
2022-11-02 2:11 ` Phil Sainty
2022-11-02 10:56 ` Robert Pluim
2022-10-31 13:38 ` Andreas Schwab
2022-10-31 16:45 ` Michael Albinus
2022-10-31 15:35 ` João Távora
2022-10-31 16:04 ` Stefan Kangas
2022-10-31 16:24 ` João Távora
2022-10-31 17:28 ` Stefan Kangas
2022-10-31 21:45 ` Gregory Heytings
-- strict thread matches above, loose matches on Subject: below --
2022-10-31 15:25 Payas Relekar
2022-10-31 16:11 ` João Távora
2022-10-31 16:48 ` Michael Albinus
2022-10-31 17:57 ` Stefan Monnier
2022-10-31 18:33 ` Andreas Schwab
2022-10-31 20:39 ` Stefan Monnier
2022-10-31 21:10 ` Óscar Fuentes
2022-10-31 21:15 ` Andreas Schwab
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87y1spy8mk.fsf@gmx.de \
--to=michael.albinus@gmx.de \
--cc=emacs-devel@gnu.org \
--cc=gerd.moellmann@gmail.com \
--cc=gregory@heytings.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.