From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Andreas Schwab Newsgroups: gmane.emacs.devel Subject: Re: Renaming files with git not all that bad? Date: Thu, 09 Dec 2021 09:43:54 +0100 Message-ID: <87o85qmalx.fsf@igel.home> References: <19fed68e4cabf6148ef8f2d18e852d97@webmail.orcon.net.nz> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="39714"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.90 (gnu/linux) Cc: emacs-devel@gnu.org, Stefan Kangas , Mathias Dahl To: Phil Sainty Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Thu Dec 09 09:44:57 2021 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mvF2v-000A2q-89 for ged-emacs-devel@m.gmane-mx.org; Thu, 09 Dec 2021 09:44:57 +0100 Original-Received: from localhost ([::1]:55428 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mvF2t-0006P5-M7 for ged-emacs-devel@m.gmane-mx.org; Thu, 09 Dec 2021 03:44:55 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:43650) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mvF23-0005h5-H7 for emacs-devel@gnu.org; Thu, 09 Dec 2021 03:44:03 -0500 Original-Received: from mail-out.m-online.net ([212.18.0.9]:37120) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mvF21-0002TY-Dc for emacs-devel@gnu.org; Thu, 09 Dec 2021 03:44:03 -0500 Original-Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 4J8nd849ddz1r86y; Thu, 9 Dec 2021 09:43:56 +0100 (CET) Original-Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 4J8nd83nHfz1qqkC; Thu, 9 Dec 2021 09:43:56 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Original-Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id I-COQCUcih_T; Thu, 9 Dec 2021 09:43:55 +0100 (CET) X-Auth-Info: 7Ca6Ey8O2/K+OddaubXSLOvoEoletVFQsg7LBCwpPeXQai5AdP3nExcwNJ5BixBt Original-Received: from igel.home (ppp-46-244-179-243.dynamic.mnet-online.de [46.244.179.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPSA; Thu, 9 Dec 2021 09:43:55 +0100 (CET) Original-Received: by igel.home (Postfix, from userid 1000) id 05C3A2C0EEC; Thu, 9 Dec 2021 09:43:55 +0100 (CET) X-Yow: UH-OH!! I put on ``GREAT HEAD-ON TRAIN COLLISIONS of the 50's'' by mistake!!! In-Reply-To: <19fed68e4cabf6148ef8f2d18e852d97@webmail.orcon.net.nz> (Phil Sainty's message of "Thu, 09 Dec 2021 16:56:05 +1300") Received-SPF: pass client-ip=212.18.0.9; envelope-from=whitebox@nefkom.net; helo=mail-out.m-online.net X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 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-mx.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.io gmane.emacs.devel:281462 Archived-At: On Dez 09 2021, Phil Sainty wrote: > On 2021-12-09 16:20, Stefan Kangas wrote: >> The key thing seems to be making sure to make no other changes >> than the actual moving of the file in a single commit. This >> is to make it easy for the git heuristics to notice that the >> file was moved. > > That's the right process IMO. If ever I'm going to rename a > file which has uncommitted changes, I'll stash my changes and > introduce a separate rename commit for the original file content > before continuing, for the exact reason of maximising Git's > ability to detect it. Git doesn't care. The rename detection is always performed on the two end points of a diff operation, irrespective of the intervening history. Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510 2552 DF73 E780 A9DA AEC1 "And now for something completely different."