Re: rename tracking and file-name swapping

From: Junio C Hamano <gitster@pobox.com>
Date: Sep 13, 2009, 18:14 UTC
Message-ID: <7viqfmsoej.fsf@alter.siamese.dyndns.org>
In-Reply-To: <wavexx-2ECE7F.13171313092009@ger.gmane.org>

Yuri D'Elia <wavexx@users.sf.net> writes:

Show 14 quoted lines

> Hi everyone. Does rename tracking recognize two file names being swapped?
>
> % ls -l
> total 24
> -rw-rw-r--   1 wavexx  wavexx  5952 Sep 13 13:09 file1.txt
> -rw-rw-r--   1 wavexx  wavexx  3330 Sep 13 13:09 file2.txt
> % mv file1.txt file3.txt 
> % mv file2.txt file1.txt
> % mv file3.txt file2.txt
> % git add file1.txt file2.txt 
> % git diff -M --stat --cached
>  file1.txt |  150 +++++++++++++++++++++++-------------------------------------
>  file2.txt |  150 +++++++++++++++++++++++++++++++++++++-----------------------
>  2 files changed, 150 insertions(+), 150 deletions(-)

By default, if the pathname that was present in the old version still appears in the new version, that path is not considered as a candiate for rename detection. Only "X used to be there but is gone" and "Y did not exist but appeared" are paired up and checked if they are similar.

Give the command -B option, too, to break the filepair that does not disappear.