From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Tassilo Horn Newsgroups: gmane.emacs.devel Subject: Re: Obscure error/warning/information message from git pull Date: Fri, 14 Nov 2014 14:10:15 +0100 Message-ID: <87389mkjwo.fsf@thinkpad-t440p.tsdh.org> References: <20141114120604.GA3859@acm.acm> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1415971103 6488 80.91.229.3 (14 Nov 2014 13:18:23 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 14 Nov 2014 13:18:23 +0000 (UTC) Cc: emacs-devel@gnu.org To: Alan Mackenzie Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Nov 14 14:18:16 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 1XpGlU-0005kU-Ce for ged-emacs-devel@m.gmane.org; Fri, 14 Nov 2014 14:18:16 +0100 Original-Received: from localhost ([::1]:36474 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpGlT-0002EG-TG for ged-emacs-devel@m.gmane.org; Fri, 14 Nov 2014 08:18:15 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:50768) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpGdx-0006EB-Bl for emacs-devel@gnu.org; Fri, 14 Nov 2014 08:10:34 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XpGdp-0004NB-IN for emacs-devel@gnu.org; Fri, 14 Nov 2014 08:10:29 -0500 Original-Received: from out3-smtp.messagingengine.com ([66.111.4.27]:41664) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpGdp-0004MF-Fr for emacs-devel@gnu.org; Fri, 14 Nov 2014 08:10:21 -0500 Original-Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 003F120BFD for ; Fri, 14 Nov 2014 08:10:20 -0500 (EST) Original-Received: from frontend2 ([10.202.2.161]) by compute1.internal (MEProxy); Fri, 14 Nov 2014 08:10:20 -0500 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=x-sasl-enc:from:to:cc:subject:references :date:in-reply-to:message-id:mime-version:content-type; s= smtpout; bh=TUtIkCrucw4wkjMNGxbw3/q1pg0=; b=oBVTONlloM47uHGCOD10 KWs1J4qZQk2dukiOLRtvo/lTta03/+dsFkvzGOCVU86m47Ld+jkWaJZjlYAuDb/Z DCNubX0xr3PbcEfFyZYIEmnh9GPqgQuS/7lYk7vB+Jml9iPJkDmXQOH/uBxV+o7Y 83uB8WS3jcdiVnnvr0G78uc= X-Sasl-enc: bUAJ0ihN5aAl57PX4lg6/IjshOnvJQrcDJ3KHbZpo7w0 1415970620 Original-Received: from thinkpad-t440p.tsdh.org (unknown [2.162.226.32]) by mail.messagingengine.com (Postfix) with ESMTPA id 00C136800D7; Fri, 14 Nov 2014 08:10:19 -0500 (EST) Mail-Followup-To: Alan Mackenzie , emacs-devel@gnu.org In-Reply-To: <20141114120604.GA3859@acm.acm> (Alan Mackenzie's message of "Fri, 14 Nov 2014 12:06:04 +0000") User-Agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/25.0.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 66.111.4.27 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:177070 Archived-At: Alan Mackenzie writes: Hi Alan, > I have two repositories in directories named .../master and > .../emacs-24, the second having been cloned from the first. I'm no git super-expert, but using git clone tsdh@git.sv.gnu.org:/srv/git/emacs.git I got a clone of the official repo containing all branches with the master branch being current. Then I did cd emacs git checkout emacs-24 cd .. git clone emacs emacs-24 which gave me a new directory emacs-24 that automatically tracks the emacs-24 branch so that I can pull/push in there. However, now the origin remote is the directory ../emacs, not savannah, so pulling/ pushing works with that, not upstream on savannah. So I changed emacs-24/.git/config from --8<---------------cut here---------------start------------->8--- [core] repositoryformatversion = 0 filemode = true bare = false logallrefupdates = true [remote "origin"] url = /home/horn/Repos/el/emacs fetch = +refs/heads/*:refs/remotes/origin/* [branch "emacs-24"] remote = origin merge = refs/heads/emacs-24 --8<---------------cut here---------------end--------------->8--- to --8<---------------cut here---------------start------------->8--- [core] repositoryformatversion = 0 filemode = true bare = false logallrefupdates = true [remote "origin"] url = tsdh@git.sv.gnu.org:/srv/git/emacs.git fetch = +refs/heads/*:refs/remotes/origin/* [branch "emacs-24"] remote = origin merge = refs/heads/emacs-24 --8<---------------cut here---------------end--------------->8--- Well, the result was that another "git pull" downloaded quite some stuff, so now I also have all branches available also in emacs-24. I think I should have set the fetch ref-spec to emacs-24 instead of * above... Who knows. But still my emacs-24 dir is only 364M whereas the emacs dir I cloned from savannah is 619M. Anyway, now I did cd ../emacs git checkout master so that I have the master branch in emacs/ and the emacs-24 branch in emacs-24/. Pulling works in both, pushing untested so far (but I'm pretty sure it'll do the trick). > glossary), but not what "the remote" means (is it referring to the > .../master repository, or is it something within .../emacs-24?). The remotes are the servers you are pulling/pushing with. The origin remote is the one you initially cloned from, i.e., savannah. It can also be a directory if you did "git clone path/to/emacs path/to/emacs-foo". > What about "but no such ref was fetched"? Fetched from where? From > the .../master repository, perhaps? I guess your problem is that "git clone dir1 dir2" doesn't create a full copy of all branches but only the branch that was current in dir1 which is probably master in your case. That's why I've switched to emacs-24 before cloning in my receipe above. > 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? Probably, "git checkout emacs-24 && git log". HTH, Tassilo