Re: Emacs git repo mangled

[Michael Albinus]

João Távora <joaotavora@gmail.com> writes:

Hi João,

> I've now looked at the situation, and I still don't understand what's
> wrong.  As I expected the Eglot branch feature/eglot2emacs is just a
> branch that shares no initial history with Emacs's mainline until the
> merge with commit feature/eglot2texi manual, whose firstcommit, authored
> by Eli, branches off the mainline in baa39e48.
>
> Until that merge feature/eglot2emacs contains no files but
> lisp/progmodes/eglot.el so that ls output, after you 'git checkout' to
> one of feature/eglot2emacs's commits is for untracked files in your
> working directory.
>
> I detect nothing wrong in the tree: it's exactly what I would expect it
> to be.  But I don't know exactly what Michael is trying to do.

There's nothing wrong with the eglot merge AFAICS. But the respective
commits are useless when you run "git bisect" and you land there,
because Emacs cannot be compiled based on any of those commits. That was
my pain.

Best regards, Michael.