From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Ben McGinnes Newsgroups: gmane.emacs.devel Subject: Re: Emacs 26 MacOS bugs Date: Sat, 10 Feb 2018 04:22:24 +1100 Message-ID: <20180209172224.af3y5l5oo63mo22y@adversary.org> References: <20180206190518.f43jsoughhlsi22y@adversary.org> <20180206222722.5uf43fd56p44dk5z@adversary.org> <20180207004331.q4cll6nyldse2bin@adversary.org> <20180207021301.zpvpexdkewztqxo4@adversary.org> <20180207225505.GB1066@breton.holly.idiocy.org> <20180209163512.bgoqgj2ayyv4vvyq@adversary.org> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="kkexpscu6q3xq375" X-Trace: blaine.gmane.org 1518197372 17839 195.159.176.226 (9 Feb 2018 17:29:32 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Fri, 9 Feb 2018 17:29:32 +0000 (UTC) User-Agent: NeoMutt/20171215 Cc: Alan Third , Ben McGinnes , Philipp Stephani , Emacs developers To: Noam Postavsky Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Feb 09 18:29:27 2018 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ekCTw-00032C-Jz for ged-emacs-devel@m.gmane.org; Fri, 09 Feb 2018 18:29:04 +0100 Original-Received: from localhost ([::1]:48596 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ekCVy-0006Wg-2i for ged-emacs-devel@m.gmane.org; Fri, 09 Feb 2018 12:31:10 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:51595) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ekCVk-0006Ua-5j for emacs-devel@gnu.org; Fri, 09 Feb 2018 12:30:57 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ekCVf-0008N1-S1 for emacs-devel@gnu.org; Fri, 09 Feb 2018 12:30:56 -0500 Original-Received: from ec2-52-29-175-128.eu-central-1.compute.amazonaws.com ([52.29.175.128]:63023 helo=devious.adversary.org) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ekCVf-0008Mj-Je for emacs-devel@gnu.org; Fri, 09 Feb 2018 12:30:51 -0500 Content-Disposition: inline In-Reply-To: OpenPGP: "id=DB4724E6FA4286C92B4E55C4321E4E2373590E5D; url=http://www.adversary.org/ben-key.asc" X-detected-operating-system: by eggs.gnu.org: FreeBSD 9.x [fuzzy] X-Received-From: 52.29.175.128 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:222639 Archived-At: --kkexpscu6q3xq375 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Feb 09, 2018 at 11:57:33AM -0500, Noam Postavsky wrote: > On Fri, Feb 9, 2018 at 11:35 AM, Ben McGinnes wrote: >=20 >> When the commit log says something like "Merge from origin/emacs-26" I >> should take that to mean not really emacs-26 at all? >=20 > 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/mas= ter, 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 --kkexpscu6q3xq375 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEABEKAB0WIQSkiyjzmoPmPFW48w5Icjp1eQQexgUCWn3Y0AAKCRBIcjp1eQQe xqV4AP0fXn9N76ZPK2aQVIhs2nEDHUoJoMBizfgvtYdG6nJwQwEAxx00Kzbbjgok xblW1AmQCx/9vC9bwyY0NSXEhKaj6GI= =gmBO -----END PGP SIGNATURE----- --kkexpscu6q3xq375--