From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Alan Mackenzie Newsgroups: gmane.emacs.devel Subject: Obscure error/warning/information message from git pull Date: Fri, 14 Nov 2014 12:06:04 +0000 Message-ID: <20141114120604.GA3859@acm.acm> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1415966835 31244 80.91.229.3 (14 Nov 2014 12:07:15 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 14 Nov 2014 12:07:15 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Nov 14 13:07:02 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 1XpFeX-0003Ff-LX for ged-emacs-devel@m.gmane.org; Fri, 14 Nov 2014 13:07:01 +0100 Original-Received: from localhost ([::1]:36059 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpFeX-0007kf-5v for ged-emacs-devel@m.gmane.org; Fri, 14 Nov 2014 07:07:01 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:36448) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpFeM-0007ii-1n for emacs-devel@gnu.org; Fri, 14 Nov 2014 07:06:57 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XpFeE-0001Vm-Hb for emacs-devel@gnu.org; Fri, 14 Nov 2014 07:06:49 -0500 Original-Received: from colin.muc.de ([193.149.48.1]:37713 helo=mail.muc.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpFeE-0001VQ-7t for emacs-devel@gnu.org; Fri, 14 Nov 2014 07:06:42 -0500 Original-Received: (qmail 24511 invoked by uid 3782); 14 Nov 2014 12:06:40 -0000 Original-Received: from acm.muc.de (pD9519C83.dip0.t-ipconnect.de [217.81.156.131]) by colin.muc.de (tmda-ofmipd) with ESMTP; Fri, 14 Nov 2014 13:06:39 +0100 Original-Received: (qmail 4003 invoked by uid 1000); 14 Nov 2014 12:06:04 -0000 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-Delivery-Agent: TMDA/1.1.12 (Macallan) X-Primary-Address: acm@muc.de X-detected-operating-system: by eggs.gnu.org: FreeBSD 8.x X-Received-From: 193.149.48.1 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:177066 Archived-At: Hello, Emacs. Would somebody please help me with our new wonderfully simple and elegant version control system. I have two repositories in directories named .../master and .../emacs-24, the second having been cloned from the first. I've done "git pull" in master, and it seems to have worked. I did "git pull" in .../emacs-24, and it didn't work. (Error messages lost). When I now do "git pull" in .../emacs-24, I get the following gobbledegook: Your configuration specifies to merge with the ref 'emacs-24' from the remote, but no such ref was fetched. Is this an error message, is it a warning, or is merely informational? I've a vague idea of what "ref" means here (having looked at the git glossary), but not what "the remote" means (is it referring to the .../master repository, or is it something within .../emacs-24?). What does the ungrammatical "specifies to merge with the ref 'emacs-24'" mean? What does 'emacs-24' refer to? Is it the branch within the repository? And what are the things, one of them implicit, that are to be merged here, and where does the result of this merge go? What about "but no such ref was fetched"? Fetched from where? From the .../master repository, perhaps? Is this message telling me that there are no changes to .../emacs-24, or what? Or is it telling me my configuration is broken? Here is my .../emacs-24/.git/config: [core] repositoryformatversion = 0 filemode = true bare = false logallrefupdates = true [remote "origin"] url = /home/acm/emacs/emacs.git/master/. fetch = +refs/heads/*:refs/remotes/origin/* [branch "master"] remote = origin merge = refs/heads/master [branch "emacs-24"] remote = origin merge = refs/heads/emacs-24 I then tried looking at the log in .../master, to see if that might give me a clue. Not really. It just lists a load of commits without saying which branch they're in. Does that mean they're all in the master branch, and there's none in the emacs-24 branch? This is where version numbers would have come in handy, to see if there's anything missing. Then I wanted to list only those those commits in the emacs-24 branch. Ha! "git help log" was of no help. It goes into a man page, and there is nothing helpful there thus to restrict the display. There appears not to be an option such as "-b emacs-24". There is a "--branches" option, but what that is supposed to do is completely opaque to me. How do I do what I want, here? Thanks for the help! -- Alan Mackenzie (Nuremberg, Germany).