454
return count;
455
}
456
457
+static void remove_unneeded_paths_from_src(int detecting_copies)
458
+{
459
+ int i, new_num_src;
460
+
461
+ if (detecting_copies)
462
+ return; /* nothing to remove */
463
+ if (break_idx)
464
+ return; /* culling incompatible with break detection */
465
+
466
+ /*
467
+ * Note on reasons why we cull unneeded sources but not destinations:
468
+ * 1) Pairings are stored in rename_dst (not rename_src), which we
469
+ * need to keep around. So, we just can't cull rename_dst even
470
+ * if we wanted to. But doing so wouldn't help because...
471
+ *
472
+ * 2) There is a matrix pairwise comparison that follows the
473
+ * "Performing inexact rename detection" progress message.
474
+ * Iterating over the destinations is done in the outer loop,
475
+ * hence we only iterate over each of those once and we can
476
+ * easily skip the outer loop early if the destination isn't
477
+ * relevant. That's only one check per destination path to
478
+ * skip.
479
+ *
480
+ * By contrast, the sources are iterated in the inner loop; if
481
+ * we check whether a source can be skipped, then we'll be
482
+ * checking it N separate times, once for each destination.
483
+ * We don't want to have to iterate over known-not-needed
484
+ * sources N times each, so avoid that by removing the sources
485
+ * from rename_src here.
486
+ */
487
+ for (i = 0, new_num_src = 0; i < rename_src_nr; i++) {
488
+ /*
489
+ * renames are stored in rename_dst, so if a rename has
490
+ * already been detected using this source, we can just
491
+ * remove the source knowing rename_dst has its info.
492
+ */
493
+ if (rename_src[i].p->one->rename_used)
494
+ continue;
495
+
496
+ if (new_num_src < i)
497
+ memcpy(&rename_src[new_num_src], &rename_src[i],
498
+ sizeof(struct diff_rename_src));
499
+ new_num_src++;
500
+ }
501
+
502
+ rename_src_nr = new_num_src;
503
+}
504
+
505
void diffcore_rename(struct diff_options *options)
506
{
507
int detect_rename = options->detect_rename;
577
if (minimum_score == MAX_SCORE)
578
goto cleanup;
579
532
- /*
533
- * Calculate how many renames are left (but all the source
534
- * files still remain as options for rename/copies!)
535
- */
580
+ /* Calculate how many renames are left */
581
num_destinations = (rename_dst_nr - rename_count);
582
+ remove_unneeded_paths_from_src(want_copies);
583
num_sources = rename_src_nr;
538
- if (!want_copies)
539
- num_sources -= rename_count;
584
585
/* All done? */
586
if (!num_destinations || !num_sources)
622
struct diff_filespec *one = rename_src[j].p->one;
623
struct diff_score this_src;
624
581
- if (one->rename_used && !want_copies)
582
- continue;
625
+ assert(!one->rename_used || want_copies || break_idx);
626
627
if (skip_unmodified &&
628
diff_unmodified_pair(rename_src[j].p))