Merge branch 'nd/shallow-fixup' into maint

diff --git a/diffcore-rename.c b/diffcore-rename.c
index 15c014d864c65e2a6dd17523bacf1681a276db01..f7444c86bde3909c8fca23f71c4852514eb26b88 100644 (file)
--- a/diffcore-rename.c
+++ b/diffcore-rename.c
@@ -576,7 +576,7 @@ void diffcore_rename(struct diff_options *options)
        stop_progress(&progress);
 
        /* cost matrix sorted by most to least similar pair */
-       qsort(mx, dst_cnt * NUM_CANDIDATE_PER_DST, sizeof(*mx), score_compare);
+       QSORT(mx, dst_cnt * NUM_CANDIDATE_PER_DST, score_compare);
 
        rename_count += find_renames(mx, dst_cnt, minimum_score, 0);
        if (detect_rename == DIFF_DETECT_COPY)