Re: Emacs git repo mangled

[Michael Albinus]

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.