From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Sergey Organov Newsgroups: gmane.emacs.devel Subject: Re: Obscure error/warning/information message from git pull Date: Tue, 18 Nov 2014 19:59:51 +0300 Message-ID: References: <20141114120604.GA3859@acm.acm> <87389mkjwo.fsf@thinkpad-t440p.tsdh.org> <20141114141434.GM3565@embecosm.com> <20141114180521.GA3168@acm.acm> <20141114230235.GF3168@acm.acm> <20141117141123.GA4294@acm.acm> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1416330047 27941 80.91.229.3 (18 Nov 2014 17:00:47 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 18 Nov 2014 17:00:47 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Nov 18 18:00:40 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 1Xqm8s-00050F-KQ for ged-emacs-devel@m.gmane.org; Tue, 18 Nov 2014 18:00:38 +0100 Original-Received: from localhost ([::1]:54216 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xqm8s-0005D9-79 for ged-emacs-devel@m.gmane.org; Tue, 18 Nov 2014 12:00:38 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:54340) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xqm8U-0004aa-45 for emacs-devel@gnu.org; Tue, 18 Nov 2014 12:00:19 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xqm8O-0005xI-9Y for emacs-devel@gnu.org; Tue, 18 Nov 2014 12:00:14 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:51611) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xqm8O-0005wm-3j for emacs-devel@gnu.org; Tue, 18 Nov 2014 12:00:08 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1Xqm8M-0004oL-Cf for emacs-devel@gnu.org; Tue, 18 Nov 2014 18:00:06 +0100 Original-Received: from 89.175.180.246 ([89.175.180.246]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 18 Nov 2014 18:00:06 +0100 Original-Received: from sorganov by 89.175.180.246 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 18 Nov 2014 18:00:06 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 52 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: 89.175.180.246 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.3 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:177587 Archived-At: Alan Mackenzie writes: > Hello, Sergey. > > On Mon, Nov 17, 2014 at 02:54:06PM +0300, Sergey Organov wrote: >> Alan Mackenzie writes: > > >> >> 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, and git knows which revisions are on which branch (or branches?), > >> You pretend you don't understand what I said above? > > I didn't understand when I wrote it, I think I do now. You want to use > "branch" to mean what people like me would call "branch tip" or "branch > head". This change in meaning can only lead to confusion and > difficulties communicating. > >> It's not for playing with words. One better speaks "GIT language" if he >> wants to be efficient with GIT. > > I looked in the git glossary, and that confirmed that the official usage > of "branch" is as I have used and continue to use it. Please continue to call branch "branch", no opposition. My point is that once you send "branch" to a Git command, it effectively becomes "branch tip", "branch head", or "ref", or a "pointer to particular commit", whatever we might call it, as Git itself has no "branches" that are "active lines of development" in its data model. Understanding this makes it clear why you need to say something like this: $ git log --source emacs-24 origin/master to get "list of commits with branch names", where: --source Print out the ref name given on the command line by which each commit was reached. Please notice no "branch" in the description of the "--source", and notice that "origin/master" is a ref, but not actually a branch, that makes no difference for Git. You can have used Git tag the same way and it would still work.Kinda like "everything is a buffer" in Emacs. -- Sergey.