From mboxrd@z Thu Jan 1 00:00:00 1970 From: Petr Baudis Subject: Re: Cherry-pick particular object Date: Wed, 29 Mar 2006 01:28:51 +0200 Message-ID: <20060328232851.GE27689@pasky.or.cz> References: <20060328113107.20ab4c21.sebastien@xprima.com> <20060328225429.GD27689@pasky.or.cz> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: sean , =?iso-8859-1?Q?S=E9bastien?= Pierre , git@vger.kernel.org X-From: git-owner@vger.kernel.org Wed Mar 29 01:28:58 2006 Return-path: Envelope-to: gcvg-git@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by ciao.gmane.org with esmtp (Exim 4.43) id 1FONcO-0005Tx-CW for gcvg-git@gmane.org; Wed, 29 Mar 2006 01:28:56 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964832AbWC1X2s (ORCPT ); Tue, 28 Mar 2006 18:28:48 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S964836AbWC1X2s (ORCPT ); Tue, 28 Mar 2006 18:28:48 -0500 Received: from w241.dkm.cz ([62.24.88.241]:48773 "EHLO machine.or.cz") by vger.kernel.org with ESMTP id S964832AbWC1X2r (ORCPT ); Tue, 28 Mar 2006 18:28:47 -0500 Received: (qmail 30261 invoked by uid 2001); 29 Mar 2006 01:28:51 +0200 To: Linus Torvalds Content-Disposition: inline In-Reply-To: X-message-flag: Outlook : A program to spread viri, but it can do mail too. User-Agent: Mutt/1.5.11 Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: Dear diary, on Wed, Mar 29, 2006 at 01:24:13AM CEST, I got a letter where Linus Torvalds said that... > On Wed, 29 Mar 2006, Petr Baudis wrote: > > > Dear diary, on Wed, Mar 29, 2006 at 12:44:02AM CEST, I got a letter > > where Linus Torvalds said that... > > > Ie you can have a tree like this: > > > > > > 100644 blob f2ba8f84ab5c1bce84a7b441cb1959cfc7093b7f abc > > > 120000 blob f2ba8f84ab5c1bce84a7b441cb1959cfc7093b7f file > > > > > > where the first one is a regular file called "abc" (which contains the > > > string "abc"), and the second is the _symlink_ that points to "abc". > > > > > > They share the exact same blob, and what distinguishes them is the > > > filemode info from git-read-tree. > > > > Huh? Didn't you rather want to say that "file" will point to a blob > > containing just the "abc" string (the symlink target)? ;-) > > Well no, maybe I should have called the first file something else. > > Both "abc" and "file" from a git perspective have the same _contents_ (the > blob containing the data 'abc'). Oh, I've totally missed the '(which contains the string "abc")' part, sorry. Apparently it's time to sleep for me. :/ -- Petr "Pasky" Baudis Stuff: http://pasky.or.cz/ Right now I am having amnesia and deja-vu at the same time. I think I have forgotten this before.