Re: Emacs 26 MacOS bugs

[Ben McGinnes <ben@adversary.org>]

[-- Attachment #1: Type: text/plain, Size: 1268 bytes --]

On Fri, Feb 09, 2018 at 11:57:33AM -0500, Noam Postavsky wrote:
> On Fri, Feb 9, 2018 at 11:35 AM, Ben McGinnes <ben@adversary.org> wrote:
> 
>> When the commit log says something like "Merge from origin/emacs-26" I
>> should take that to mean not really emacs-26 at all?
> 
> Perhaps you're looking at the wrong side of the merge?

I suppose that could be the case, but from my POV I see:

commit 5c414441ed73f1a302a2953dc493e83b98589262 (HEAD -> master, origin/master, origin/HEAD)

Preceded by:

commit 8e42b1bd3c8ba1757c150149f0d21eabd9245dcc

Preceded by the commit I've been referring to:

commit a0c7157a16481b0523ad20cda9115f9435188f73
Merge: c24c5dc4a4 c787a49682

Which means the answer lies in what it is my local copy thinks origin
is and what master and/or HEAD are:

nefarious:gnu-emacs ben$ git remote -v
origin	git://git.sv.gnu.org/emacs.git (fetch)
origin	git://git.sv.gnu.org/emacs.git (push)
nefarious:gnu-emacs ben$ git branch -l
  emacs-25
  emacs-26
* master
nefarious:gnu-emacs ben$ git status
On branch master
Your branch is up to date with 'origin/master'.

nothing to commit, working tree clean
nefarious:gnu-emacs ben$

Although another fetch proved that last part wrong, of course.


Regards,
Ben

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]