Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757718AbZAIU6g (ORCPT ); Fri, 9 Jan 2009 15:58:36 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757040AbZAIU5J (ORCPT ); Fri, 9 Jan 2009 15:57:09 -0500 Received: from vms044pub.verizon.net ([206.46.252.44]:37375 "EHLO vms044pub.verizon.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757373AbZAIU5E (ORCPT ); Fri, 9 Jan 2009 15:57:04 -0500 Date: Fri, 09 Jan 2009 15:56:57 -0500 (EST) From: Len Brown Subject: git mv (was Re: [git pull] ACPI & Suspend patches for 2.6.29-rc0) In-reply-to: X-X-Sender: lenb@localhost.localdomain To: Linus Torvalds Cc: Andrew Morton , Linux Kernel Mailing List , linux-acpi@vger.kernel.org, Linux Power Management List Message-id: MIME-version: 1.0 Content-type: TEXT/PLAIN; charset=US-ASCII References: User-Agent: Alpine 2.00 (LFD 1167 2008-08-23) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1509 Lines: 42 > As usual, git is actually smarter and get things more correct than people > realize. What you found "surprising" is actually a "profound truth". > > Git is like a great indian mystic. It sees past the veil of the trivial, > to find the true connections in life. > > Or at least in source code. Thanks for confirming that the unexpected diff is a fature of git rather than a bug. Since I had used "git mv", I had expected everything to show up as a move. However, I understand that comparing file contents over that move and other code moves told a different 'big picture' story. I guess using 'git mv' gave me the false expectation that git actually tracks moves like other SCMs and it would show up that way in the diff -- though now that I think about it, I like the comparison of the two endpoints that git did even better. I guess you can make an argument either way about how to handle moves. One problem that both have to deal with is that a history on the old (now missing) file location doesn't work, and that by default the history on the new location stops unless log --follow is used. gitk doesn't use --follow by default, and when it is added, the history looks pretty strange. thanks, -Len Brown Intel Open Source Technology Center -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/