Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-11-30 00:28:03 +0300
committerJunio C Hamano <gitster@pobox.com>2016-11-30 00:28:03 +0300
commit0a79ccaac7dcfaf93294979fd9608d0f95fd7a47 (patch)
tree98304d366784390c68781993efc54da0242ab90a /diff.c
parentaf8d6a9821d79f18c8b645582b5b5d251066ae2f (diff)
parent974e0044d65dc22e8137e93b8ea13aec23d3a5a3 (diff)
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()
Diffstat (limited to 'diff.c')
-rw-r--r--diff.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/diff.c b/diff.c
index fe6f59160f..8c78fce49d 100644
--- a/diff.c
+++ b/diff.c
@@ -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);