git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Shawn O. Pearce" <spearce@spearce.org>
To: git@vger.kernel.org
Cc: govindsalinas <govindsalinas@yahoo.com>
Subject: Basename matching during rename/copy detection
Date: Wed, 20 Jun 2007 23:06:22 -0400	[thread overview]
Message-ID: <20070621030622.GD8477@spearce.org> (raw)

So Govind Salinas has found an interesting case in the rename
detection code:

  $ git clone git://repo.or.cz/Widgit.git
  $ git diff -M --raw -r 192e^ 192e | grep .resx
  :100755 000000 4c8ab79... 0000000... D  Form1.resx
  :100755 100755 9e70146... 9e70146... R100       CommitViewer.resx       UI/CommitViewer.resx
  :100755 100755 90929fd... b40ff98... C091       RepoManager.resx        UI/Form1.resx
  :100755 100755 90929fd... 90929fd... C100       PreferencesEditor.resx  UI/PreferencesEditor.resx
  :100755 100755 90929fd... 90929fd... R100       PreferencesEditor.resx  UI/RepoManager.resx
  :100755 100755 90929fd... 8535007... R097       RepoManager.resx        UI/RepoTreeView.resx

In this case several files had identical old images, and some
kept that old image during the rename.  Unfortunately because of
the ordering of the files in the tree Git has decided to "rename"
the PreferencesEditor.resx file to UI/RepoManager.resx, rather than
renaming RepoManager.resx to UI/RepoManager.resx.  Go Git.

I'm wondering if we shouldn't play the game of trying to match
delete/add pairs up by not only similarity, but also by path
basename.  In the case above its exactly what Govind thought should
happen; he moved the file from one directory to another, and didn't
even change its content during the move.  But Git decided "better"
to use a totally different file in the "rename".

-- 
Shawn.

             reply	other threads:[~2007-06-21  3:07 UTC|newest]

Thread overview: 44+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-06-21  3:06 Shawn O. Pearce [this message]
2007-06-21  3:13 ` Basename matching during rename/copy detection Junio C Hamano
2007-06-21  8:00   ` Andy Parkins
2007-06-21  8:07     ` Junio C Hamano
2007-06-21  9:50       ` Andy Parkins
2007-06-21 11:52         ` Johannes Schindelin
2007-06-21 12:44           ` Andy Parkins
2007-06-21 12:53             ` Matthieu Moy
2007-06-21 13:10               ` Jeff King
2007-06-21 13:18               ` Johannes Schindelin
2007-06-21 13:25                 ` Matthieu Moy
2007-06-21 13:52                   ` Johannes Schindelin
2007-06-21 15:37                     ` Steven Grimm
2007-06-21 15:53                       ` Johannes Schindelin
2007-06-21 16:57                         ` Steven Grimm
2007-06-21 13:22             ` Johannes Schindelin
2007-06-21  3:42 ` Linus Torvalds
2007-06-21 11:52   ` [PATCH] diffcore-rename: favour identical basenames Johannes Schindelin
2007-06-21 13:19     ` Jeff King
2007-06-21 14:03       ` Johannes Schindelin
2007-06-21 16:20       ` Linus Torvalds
2007-06-21 17:52         ` Junio C Hamano
2007-06-21 18:24           ` Linus Torvalds
2007-06-22 15:19         ` Andy Parkins
2007-06-22 15:28           ` Johannes Schindelin
2007-06-22 17:51             ` Aidan Van Dyk
2007-06-22  1:14       ` Johannes Schindelin
2007-06-22  5:41         ` Jeff King
2007-06-22 10:22           ` Johannes Schindelin
2007-06-22  7:17         ` Johannes Sixt
2007-06-22 10:39           ` Johannes Schindelin
2007-06-22 10:52             ` 100% (was: [PATCH] diffcore-rename: favour identical basenames) David Kastrup
2007-06-22 12:49               ` Johannes Schindelin
     [not found]                 ` <86abusi1fw.fsf@lola.quinscape.zz>
2007-06-23  1:31                   ` 100% Johannes Schindelin
2007-06-23 10:18                     ` 100% René Scharfe
2007-06-23 10:56                       ` 100% Johannes Schindelin
2007-06-23 11:41                         ` 100% René Scharfe
2007-06-23 12:00                           ` 100% Johannes Schindelin
2007-06-23 12:11                             ` 100% René Scharfe
2007-06-23 12:21                               ` 100% Johannes Schindelin
2007-06-24 22:23                                 ` 100% René Scharfe
2007-06-23 19:33                         ` 100% Junio C Hamano
2007-06-23 20:41                           ` 100% Johannes Schindelin
2007-06-23  5:44     ` [PATCH] diffcore-rename: favour identical basenames Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20070621030622.GD8477@spearce.org \
    --to=spearce@spearce.org \
    --cc=git@vger.kernel.org \
    --cc=govindsalinas@yahoo.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).