From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael J Gruber Subject: Re: Consistent terminology: cached/staged/index Date: Mon, 28 Feb 2011 10:38:19 +0100 Message-ID: <4D6B6D0B.3040304@drmicha.warpmail.net> References: <20110213193738.GA26868@elie> <7v8vxjwnhj.fsf@alter.siamese.dyndns.org> <20110214231920.GA24814@elie> <20110227084317.GB3356@sigill.intra.peff.net> <87bp1xest7.fsf@catnip.gol.com> <7vmxlhm3ne.fsf@alter.siamese.dyndns.org> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: Jon Seymour , Miles Bader , Jeff King , Felipe Contreras , Jonathan Nieder , Piotr Krukowiecki , git@vger.kernel.org To: Junio C Hamano X-From: git-owner@vger.kernel.org Mon Feb 28 10:41:48 2011 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Ptzbu-0005gR-S5 for gcvg-git-2@lo.gmane.org; Mon, 28 Feb 2011 10:41:47 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752888Ab1B1Jlm (ORCPT ); Mon, 28 Feb 2011 04:41:42 -0500 Received: from out1.smtp.messagingengine.com ([66.111.4.25]:47301 "EHLO out1.smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752387Ab1B1Jll (ORCPT ); Mon, 28 Feb 2011 04:41:41 -0500 Received: from compute1.internal (compute1.nyi.mail.srv.osa [10.202.2.41]) by gateway1.messagingengine.com (Postfix) with ESMTP id 6005720A2B; Mon, 28 Feb 2011 04:41:41 -0500 (EST) Received: from frontend1.messagingengine.com ([10.202.2.160]) by compute1.internal (MEProxy); Mon, 28 Feb 2011 04:41:41 -0500 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=messagingengine.com; h=message-id:date:from:mime-version:to:cc:subject:references:in-reply-to:content-type:content-transfer-encoding; s=smtpout; bh=5r+G+r6jLUq2O8duHbk6UGWtJc4=; b=p50kRD7/ZVLu1B5w15VxWWWs5k2iCAsROWLcBETt0ZNIVcsmUxQcK+ddj8XshIWqFLZXZzAdLLrjcfA6myeBN5DjLdQUd7dUNHq3nNN9LXLnZcJrXSP55lCKpAt/C5UK0Xh1INWCzMtX1bd2gUaMSVkPNP4hjs0+Ec4bVPq6pHo= X-Sasl-enc: Hb0UjgfS8CwPdv57WFlQ2xiX1GxEa9SJ7EGqulCktVKM 1298886101 Received: from localhost.localdomain (whitehead.math.tu-clausthal.de [139.174.44.62]) by mail.messagingengine.com (Postfix) with ESMTPSA id 2F8E740AD04; Mon, 28 Feb 2011 04:41:40 -0500 (EST) User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.13) Gecko/20101209 Fedora/3.1.7-0.35.b3pre.fc14 Lightning/1.0b3pre Thunderbird/3.1.7 In-Reply-To: <7vmxlhm3ne.fsf@alter.siamese.dyndns.org> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Junio C Hamano venit, vidit, dixit 28.02.2011 00:57: > Jon Seymour writes: > >> I guess the noun 'stage' does have a use in git-speak to refer to the >> different arms of an unresolved merge. > > That is correct. > > For some historical background around "cache" and "index", this > > http://thread.gmane.org/gmane.comp.version-control.git/780/focus=924 > > may shed some light. > > From: Linus Torvalds > Subject: Re: [RFC] Possible strategy cleanup for git add/remove/diff etc. > Date: Tue, 19 Apr 2005 18:51:06 -0700 (PDT) > Message-ID: > > That is indeed the whole point of the index file. In my world-view, the > index file does _everything_. It's the staging area ("work file"), it's > the merging area ("merge directory") and it's the cache file ("stat > cache"). > > And this one: > > http://thread.gmane.org/gmane.comp.version-control.git/6670/focus=6863 > > is even more illuminating. > > Notice that the word "staging area" is used in the old article as a way to > explain one of the three important aspects of the index, and the other > article that is about nailing down the terminology, the word does not even > come into the picture at all (one reason being that it will confuse > readers if "staging area" is used too casually in a document to precisely > define terminology, which needs to explain the merge stage(s) in the > index). Oh, the classics :) Thanks for an illuminating and entertaining read! Michael