diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-11-29 13:28:03 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-11-29 13:28:03 -0800 |
| commit | 0a79ccaac7dcfaf93294979fd9608d0f95fd7a47 (patch) | |
| tree | 98304d366784390c68781993efc54da0242ab90a | |
| parent | af8d6a9821d79f18c8b645582b5b5d251066ae2f (diff) | |
| parent | 974e0044d65dc22e8137e93b8ea13aec23d3a5a3 (diff) | |
| download | git-0a79ccaac7dcfaf93294979fd9608d0f95fd7a47.tar.gz | |
Merge branch 'tk/diffcore-delta-remove-unused' into maint
Code cleanup.
* tk/diffcore-delta-remove-unused:
diffcore-delta: remove unused parameter to diffcore_count_changes()
| -rw-r--r-- | diff.c | 2 | ||||
| -rw-r--r-- | diffcore-break.c | 1 | ||||
| -rw-r--r-- | diffcore-delta.c | 1 | ||||
| -rw-r--r-- | diffcore-rename.c | 4 | ||||
| -rw-r--r-- | diffcore.h | 1 |
5 files changed, 1 insertions, 8 deletions
@@ -1954,7 +1954,7 @@ static void show_dirstat(struct diff_options *options) if (DIFF_FILE_VALID(p->one) && DIFF_FILE_VALID(p->two)) { diff_populate_filespec(p->one, 0); diff_populate_filespec(p->two, 0); - diffcore_count_changes(p->one, p->two, NULL, NULL, 0, + diffcore_count_changes(p->one, p->two, NULL, NULL, &copied, &added); diff_free_filespec_data(p->one); diff_free_filespec_data(p->two); diff --git a/diffcore-break.c b/diffcore-break.c index 881a74f29e..c64359f489 100644 --- a/diffcore-break.c +++ b/diffcore-break.c @@ -73,7 +73,6 @@ static int should_break(struct diff_filespec *src, if (diffcore_count_changes(src, dst, &src->cnt_data, &dst->cnt_data, - 0, &src_copied, &literal_added)) return 0; diff --git a/diffcore-delta.c b/diffcore-delta.c index 4159748a70..e2db85abd9 100644 --- a/diffcore-delta.c +++ b/diffcore-delta.c @@ -169,7 +169,6 @@ int diffcore_count_changes(struct diff_filespec *src, struct diff_filespec *dst, void **src_count_p, void **dst_count_p, - unsigned long delta_limit, unsigned long *src_copied, unsigned long *literal_added) { diff --git a/diffcore-rename.c b/diffcore-rename.c index 73d003a08a..15c014d864 100644 --- a/diffcore-rename.c +++ b/diffcore-rename.c @@ -145,7 +145,6 @@ static int estimate_similarity(struct diff_filespec *src, * call into this function in that case. */ unsigned long max_size, delta_size, base_size, src_copied, literal_added; - unsigned long delta_limit; int score; /* We deal only with regular files. Symlink renames are handled @@ -191,11 +190,8 @@ static int estimate_similarity(struct diff_filespec *src, if (!dst->cnt_data && diff_populate_filespec(dst, 0)) return 0; - delta_limit = (unsigned long) - (base_size * (MAX_SCORE-minimum_score) / MAX_SCORE); if (diffcore_count_changes(src, dst, &src->cnt_data, &dst->cnt_data, - delta_limit, &src_copied, &literal_added)) return 0; diff --git a/diffcore.h b/diffcore.h index c11b8465fc..6230241354 100644 --- a/diffcore.h +++ b/diffcore.h @@ -142,7 +142,6 @@ extern int diffcore_count_changes(struct diff_filespec *src, struct diff_filespec *dst, void **src_count_p, void **dst_count_p, - unsigned long delta_limit, unsigned long *src_copied, unsigned long *literal_added); |