From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Thien-Thi Nguyen Newsgroups: gmane.emacs.devel Subject: Re: Obscure error/warning/information message from git pull Date: Sun, 16 Nov 2014 14:25:02 +0100 Message-ID: <87r3x3mg5t.fsf@zigzag.favinet> References: <20141114120604.GA3859@acm.acm> <87389mkjwo.fsf@thinkpad-t440p.tsdh.org> <20141114141434.GM3565@embecosm.com> <20141114180521.GA3168@acm.acm> <20141114230235.GF3168@acm.acm> Reply-To: emacs-devel@gnu.org NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha1; protocol="application/pgp-signature" X-Trace: ger.gmane.org 1416144084 14201 80.91.229.3 (16 Nov 2014 13:21:24 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 16 Nov 2014 13:21:24 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Nov 16 14:21:17 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 1XpzlV-0007dy-NC for ged-emacs-devel@m.gmane.org; Sun, 16 Nov 2014 14:21:17 +0100 Original-Received: from localhost ([::1]:43810 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpzlT-00053H-5X for ged-emacs-devel@m.gmane.org; Sun, 16 Nov 2014 08:21:15 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:52347) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpzlK-000531-B3 for emacs-devel@gnu.org; Sun, 16 Nov 2014 08:21:12 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XpzlE-0002BA-I3 for emacs-devel@gnu.org; Sun, 16 Nov 2014 08:21:06 -0500 Original-Received: from smtp209.alice.it ([82.57.200.105]:43227) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpzlE-0002B0-8L for emacs-devel@gnu.org; Sun, 16 Nov 2014 08:21:00 -0500 Original-Received: from zigzag.favinet (79.21.65.142) by smtp209.alice.it (8.6.060.28) id 5440EFA2060F2F68 for emacs-devel@gnu.org; Sun, 16 Nov 2014 14:20:59 +0100 Original-Received: from ttn by zigzag.favinet with local (Exim 4.80) (envelope-from ) id 1XpzpI-0000MB-H2 for emacs-devel@gnu.org; Sun, 16 Nov 2014 14:25:12 +0100 Mail-Followup-To: emacs-devel@gnu.org In-Reply-To: <20141114230235.GF3168@acm.acm> (Alan Mackenzie's message of "Fri, 14 Nov 2014 23:02:36 +0000") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 82.57.200.105 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:177292 Archived-At: --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable () Alan Mackenzie () Fri, 14 Nov 2014 23:02:36 +0000 > Because in GIT commits are not on a branch. All commits are > arranged into DAG, and branch is just a pointer into the DAG. > Any given commit is either reachable from given branch or > not. It's that simple. I think you're just playing with words, here. We all know what a branch is, Terminology differs between VCS models. For RCS and conceptual derivatives, a "branch" is a series of commits, and a commit can be viewed as "contained in" or "belonging to" a branch; in the DAG, "branch" includes both vertice and edge information. For Git, a "branch" is a vertice label only (edge information lies in the "commit object"). Changing a label has no effect on the commit or the edge info, and you can have more than one label on a commit. and git knows which revisions are on which branch (or branches?), otherwise your command below couldn't work. It "knows" it, sure, but if the way it knows it and the way you think it knows it differ, you will remain confused. I read some time back "Git for computer scientists" (or maybe it was "for Lisp programmers") that explained the above, more elegantly. I can't be bothered to search for it now; perhaps someone has a link handy? =2D-=20 Thien-Thi Nguyen GPG key: 4C807502 (if you're human and you know it) read my lisp: (responsep (questions 'technical) (not (via 'mailing-list))) =3D> nil --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iEYEARECAAYFAlRopbEACgkQZwMiJEyAdQJ0dACgvYLxpWdF8Jt6A5h8kaFofe08 xLQAoKF4KjhHVyWssvQFNAi2NN2+ZGfQ =EvHD -----END PGP SIGNATURE----- --=-=-=--