aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRené Scharfe <rene.scharfe@lsrfire.ath.cx>2007-06-25 00:23:28 +0200
committerJunio C Hamano <gitster@pobox.com>2007-06-24 23:12:31 -0700
commitcfc0aef1ffb8a9fe2792667597a05bbf3b6b1258 (patch)
treee16d104e9b3b90a9c952c5f4b575e9d83a4fe301
parentaeb59328453cd4f438345ea79ff04c96bccbbbb8 (diff)
downloadgit-cfc0aef1ffb8a9fe2792667597a05bbf3b6b1258.tar.gz
git-cfc0aef1ffb8a9fe2792667597a05bbf3b6b1258.tar.xz
diffcore-rename: don't change similarity index based on basename equality
This implements a suggestion from Johannes. It uses a separate field in struct diff_score to keep the result of the file name comparison in the rename detection logic. This reverts the value of the similarity index to be a function of file contents, only, and basename comparison is only used to decide between files with equal amounts of content changes. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--diffcore-rename.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/diffcore-rename.c b/diffcore-rename.c
index 79c984c9c..e0a89f379 100644
--- a/diffcore-rename.c
+++ b/diffcore-rename.c
@@ -138,6 +138,7 @@ struct diff_score {
int src; /* index in rename_src */
int dst; /* index in rename_dst */
int score;
+ int name_score;
};
static int estimate_similarity(struct diff_filespec *src,
@@ -201,11 +202,8 @@ static int estimate_similarity(struct diff_filespec *src,
*/
if (!dst->size)
score = 0; /* should not happen */
- else {
+ else
score = (int)(src_copied * MAX_SCORE / max_size);
- if (basename_same(src, dst))
- score++;
- }
return score;
}
@@ -242,6 +240,10 @@ static void record_rename_pair(int dst_index, int src_index, int score)
static int score_compare(const void *a_, const void *b_)
{
const struct diff_score *a = a_, *b = b_;
+
+ if (a->score == b->score)
+ return b->name_score - a->name_score;
+
return b->score - a->score;
}
@@ -360,6 +362,7 @@ void diffcore_rename(struct diff_options *options)
m->dst = i;
m->score = estimate_similarity(one, two,
minimum_score);
+ m->name_score = basename_same(one, two);
diff_free_filespec_data(one);
}
/* We do not need the text anymore */