From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Teemu Likonen Newsgroups: gmane.emacs.devel Subject: Re: Obscure error/warning/information message from git pull Date: Wed, 19 Nov 2014 06:48:02 +0200 Message-ID: <871tozbxtp.fsf@mithlond.arda> References: <20141114180521.GA3168@acm.acm> <20141114230235.GF3168@acm.acm> <20141117141123.GA4294@acm.acm> <83lhn89zxn.fsf@gnu.org> <83bno49xtw.fsf@gnu.org> <20141118224326.GA5167@acm.acm> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Trace: ger.gmane.org 1416372529 4689 80.91.229.3 (19 Nov 2014 04:48:49 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 19 Nov 2014 04:48:49 +0000 (UTC) Cc: Sergey Organov , emacs-devel@gnu.org To: Alan Mackenzie Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Nov 19 05:48:42 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1XqxC5-0001r9-V1 for ged-emacs-devel@m.gmane.org; Wed, 19 Nov 2014 05:48:42 +0100 Original-Received: from localhost ([::1]:56492 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XqxC5-0005vP-Ln for ged-emacs-devel@m.gmane.org; Tue, 18 Nov 2014 23:48:41 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:41048) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XqxBm-0005ui-Ek for emacs-devel@gnu.org; Tue, 18 Nov 2014 23:48:29 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XqxBe-0006Ux-Up for emacs-devel@gnu.org; Tue, 18 Nov 2014 23:48:22 -0500 Original-Received: from mta-out1.inet.fi ([62.71.2.203]:59891 helo=jenni1.inet.fi) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XqxBe-0006RW-L7 for emacs-devel@gnu.org; Tue, 18 Nov 2014 23:48:14 -0500 Original-Received: from mithlond.arda (84.251.132.236) by jenni1.inet.fi (8.5.142.08) id 546BDD580003B684; Wed, 19 Nov 2014 06:48:06 +0200 Original-Received: from dtw by mithlond.arda with local (Exim 4.80) (envelope-from ) id 1XqxBV-000197-Od; Wed, 19 Nov 2014 06:48:05 +0200 In-Reply-To: <20141118224326.GA5167@acm.acm> (Alan Mackenzie's message of "Tue, 18 Nov 2014 22:43:26 +0000") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.4.51 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 62.71.2.203 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 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-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:177712 Archived-At: --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Alan Mackenzie [2014-11-18 22:43:26 +00:00] wrote: >> Well, given the following history (time goes from left to right): > >> - C - D <- foo >> /=20 >> ... - A - B >> \ >> - E - F <- bar > > >> what branch commit A was made on, 'foo' or 'bar'? > > Quite clearly, A was committed on branch foo, since bar didn't exist > at that time. No. "A" could have been committed on a private branch called "asdfasdfasdf" by some unknown person. Then it may have been forget various ways into that project's commit DAG. Branches are not places. They just labels (sometimes temporary) that point to a commit. Nothing more. Commit operation in Git is like PUSH: (defvar a (cons 'original nil)) (defvar foo a) (defvar bar a) (push 'commit1 foo) (push 'commit2 foo) (push 'commit1 bar) (push 'commit2 bar) Both "foo" and "bar" point to a single cons cell. They know nothing about _variable_ "a" (i.e., branch label). The same applies for Git branches. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAEBCAAGBQJUbCEDAAoJEHGdadMkU5RQEmMP/2S5fz0rzM7XUePp89Izz74K H6Eun9C5ChE8eRcNb6HwbZ4R8YPevF5pUfVSS+mttmHHqsPHVg5Pxaz61PLd1uTl xm2jrVBgsdmhSdKCqeC9qvX1gRLyprHd9Zxm0xX9Sn1AQbSYKWKmfoCV2ce6922o jhu9eoYc+NFZNkDhFJai5HY/nnh2tMkdwIMCEUJejMD21jE9OKZKHb1fisK4Wjg7 oFpyIakGquFbywUwqN+gUQ0fflgCRS96xIcdB12KTaA6iUsV4OOI/8R/R0RYGIn/ 3yGTArZLjHjVacpz9ObowyiWAslvxpMeyWzGf2HTlGuwEdRJyV79vhKvVRE/1svc nNOdnnn/jhjEl8C8HbnTR46taXRAbwH1vyWz+UUWhtvUNzO9IoMHMPROs7UsZxZc Nw7Ivfm9ZslgvstbnPCitOXDspH+qjViEdup0s/ieKrob42yIRb7WXADJzSJWk3Y 93RyMiD7Rkc3UBAfNggWKoaJgdSqSgaJmtulh36J1RTVCkYviSqha6SyK8ZOQYnc 0iLQ5GQfNfJstcqKIjxGjDhTkp/URYJVqsmLbMPq865V0/FB6gpIcblCbho8gdIG zHDY+Ov59DScSThfDLj5IgHWdOdto1Aj1ThnTHauvbDEwdQ39Qb1B5GtuX4hKBnf 95swx4Z7d0r9Uk+Abz2q =MIpF -----END PGP SIGNATURE----- --=-=-=--