diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-07-02 01:45:12 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-07-02 01:45:12 -0700 |
| commit | e1bc8dc66dd5a2ef8b23c6b7cac8164d85e73307 (patch) | |
| tree | e0611ad20c9a515a0bd4378749e9b3cac41560e3 /diffcore-rename.c | |
| parent | 792d2370f975f032a708cb35044193b5b5310840 (diff) | |
| parent | b9905fed7a028cc9749cf8ad479cbb07940c8638 (diff) | |
| download | git-e1bc8dc66dd5a2ef8b23c6b7cac8164d85e73307.tar.gz | |
Merge branch 'jc/diffcore'
* jc/diffcore:
diffcore-delta.c: Ignore CR in CRLF for text files
diffcore-delta.c: update the comment on the algorithm.
diffcore_filespec: add is_binary
diffcore_count_changes: pass diffcore_filespec
Diffstat (limited to 'diffcore-rename.c')
| -rw-r--r-- | diffcore-rename.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/diffcore-rename.c b/diffcore-rename.c index e0a89f3796..6bde4396f2 100644 --- a/diffcore-rename.c +++ b/diffcore-rename.c @@ -190,8 +190,7 @@ static int estimate_similarity(struct diff_filespec *src, delta_limit = (unsigned long) (base_size * (MAX_SCORE-minimum_score) / MAX_SCORE); - if (diffcore_count_changes(src->data, src->size, - dst->data, dst->size, + if (diffcore_count_changes(src, dst, &src->cnt_data, &dst->cnt_data, delta_limit, &src_copied, &literal_added)) |