From: Ben McGinnes <ben@adversary.org>
To: Noam Postavsky <npostavs@users.sourceforge.net>
Cc: Alan Third <alan@idiocy.org>, Ben McGinnes <ben@adversary.org>,
Philipp Stephani <p.stephani2@gmail.com>,
Emacs developers <emacs-devel@gnu.org>
Subject: Re: Emacs 26 MacOS bugs
Date: Sat, 10 Feb 2018 04:22:24 +1100 [thread overview]
Message-ID: <20180209172224.af3y5l5oo63mo22y@adversary.org> (raw)
In-Reply-To: <CAM-tV-9Lbp2kcm4YffZTuoXNQr_epWzzvzKyQQp4ORnYtHoVtw@mail.gmail.com>
[-- 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 --]
next prev parent reply other threads:[~2018-02-09 17:22 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-06 14:49 Emacs 26 MacOS bugs Richard Stallman
2018-02-06 17:30 ` Noam Postavsky
2018-02-06 23:28 ` Paul Eggert
2018-02-07 3:37 ` Eli Zaretskii
2018-02-10 14:55 ` Uwe Brauer
2018-02-10 15:18 ` Noam Postavsky
2018-02-07 3:52 ` Eli Zaretskii
2018-02-06 19:05 ` Ben McGinnes
2018-02-06 20:30 ` Noam Postavsky
2018-02-06 22:27 ` Ben McGinnes
2018-02-06 22:30 ` Ben McGinnes
2018-02-06 22:50 ` Noam Postavsky
2018-02-07 0:43 ` Ben McGinnes
2018-02-07 1:33 ` Noam Postavsky
2018-02-07 2:13 ` Ben McGinnes
2018-02-07 22:55 ` Alan Third
2018-02-09 16:35 ` Ben McGinnes
2018-02-09 16:57 ` Noam Postavsky
2018-02-09 17:22 ` Ben McGinnes [this message]
2018-02-09 18:13 ` Noam Postavsky
2018-02-10 1:46 ` Ben McGinnes
2018-02-10 1:47 ` Alan Third
2018-02-11 13:53 ` Philipp Stephani
2018-02-11 21:06 ` Alan Third
2018-02-07 20:01 ` Alan Third
2018-02-10 15:01 ` Alan Third
2018-02-10 22:45 ` Alan Third
2018-02-11 11:47 ` Alan Third
2018-02-11 15:52 ` Eli Zaretskii
2018-02-11 20:57 ` Alan Third
2018-02-13 19:41 ` Ben McGinnes
2018-02-13 19:46 ` Noam Postavsky
2018-02-11 20:43 ` Richard Stallman
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=20180209172224.af3y5l5oo63mo22y@adversary.org \
--to=ben@adversary.org \
--cc=alan@idiocy.org \
--cc=emacs-devel@gnu.org \
--cc=npostavs@users.sourceforge.net \
--cc=p.stephani2@gmail.com \
/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.