From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Karl Fogel Newsgroups: gmane.emacs.devel Subject: Re: Workflow to accumulate individual changes? Date: Fri, 01 Jan 2010 15:12:01 -0500 Message-ID: <87my0xega6.fsf@red-bean.com> References: <87637of4y8.fsf@kobe.laptop> <87oclfdzs2.fsf@kobe.laptop> <87hbr6jwsy.fsf@telefonica.net> <83my0yfc9g.fsf@gnu.org> <838wchgais.fsf@gnu.org> <878wchfxcn.fsf@red-bean.com> <874on537yy.fsf@iki.fi> Reply-To: Karl Fogel NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1262376745 24205 80.91.229.12 (1 Jan 2010 20:12:25 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 1 Jan 2010 20:12:25 +0000 (UTC) Cc: ofv@wanadoo.es, Eli Zaretskii , Andreas Schwab , emacs-devel@gnu.org To: Teemu Likonen Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Jan 01 21:12:18 2010 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1NQnr7-0002UU-C2 for ged-emacs-devel@m.gmane.org; Fri, 01 Jan 2010 21:12:17 +0100 Original-Received: from localhost ([127.0.0.1]:53540 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NQnr7-0005BB-FN for ged-emacs-devel@m.gmane.org; Fri, 01 Jan 2010 15:12:17 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NQnr1-00059Q-5X for emacs-devel@gnu.org; Fri, 01 Jan 2010 15:12:11 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NQnqw-00054B-GC for emacs-devel@gnu.org; Fri, 01 Jan 2010 15:12:10 -0500 Original-Received: from [199.232.76.173] (port=58222 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NQnqw-000541-Do for emacs-devel@gnu.org; Fri, 01 Jan 2010 15:12:06 -0500 Original-Received: from sanpietro.red-bean.com ([66.146.206.141]:59373) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NQnqs-0002f3-8v; Fri, 01 Jan 2010 15:12:02 -0500 Original-Received: from localhost ([127.0.0.1]:38428 helo=floss ident=kfogel) by sanpietro.red-bean.com with esmtp (Exim 4.71) (envelope-from ) id 1NQnqr-0004JI-Mm; Fri, 01 Jan 2010 14:12:01 -0600 In-Reply-To: <874on537yy.fsf@iki.fi> (Teemu Likonen's message of "Fri, 01 Jan 2010 22:07:01 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.90 (gnu/linux) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:119226 Archived-At: Teemu Likonen writes: >On 2010-01-01 14:18 (-0500), Karl Fogel wrote: >> IIUC, in git the commit message is *not* part of the change's >> identity, it's just attached to the change, so you can edit the >> message later. > >That's wrong--or your "change's identity" means something I don't >understand. In Git commit's author, committer, date, parent commits' >SHA1s, referenced tree object's SHA1 and commit message together make >the content of a commit object. From this content is calculated the SHA1 >of that commit object. If you change any of these the SHA1 of the commit >object will be different and hence the whole commit object will be >different (i.e. its identity is different). Someone -- whom I thought would know -- specifically told me that the commit message is *not* part of the SHA1 of the commit object. I double checked, because this was surprising to me, and they confirmed. But either they were wrong, or I misunderstood, or possibly both. In any case, I'm sorry for spreading misinformation. >There is a related feature, though. New Git versions have "git notes" >command which allows user to add additional notes to commits. Such extra >notes can be added and removed freely and "git log" prints them after >the commit message. Notes can be sent between repositories but currently >it doesn't happen automatically with usual pull/push commands. > >http://www.kernel.org/pub/software/scm/git/docs/git-notes.html Maybe this is what the person thought I was talking about. -K