@matheusbsbs / matheus-bagliano / commits / 356da0f98b

Fix various issues found in comments

A random hodge-podge of incorrect or out-of-date comments that I found: * t6423 had a comment that has referred to the wrong test for years; fix it to refer to the right one. * diffcore-rename had a FIXME comment meant to remind myself to investigate if I could make another code change. I later investigated and removed the FIXME, but while cherry-picking the patch to submit upstream I missed the later update. Remove the comment now. * merge-ort had the early part of a comment for a function; I had meant to include the more involved description when I updated the function. Update the comment now. Signed-off-by: Elijah Newren <newren@gmail.com> Reviewed-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Elijah Newren committed Jun 8, 2021 at 16:11 UTC 356da0f98b2c6631b72e69d8638517dd849d28f8
3 files changed +7 -5
diffcore-rename.c
+1 -1
@@ -1544,7 +1544,7 @@ void diffcore_rename_extended(struct diff_options *options,
1544 /* all the usual ones need to be kept */
1545 diff_q(&outq, p);
1546 else
1547 - /* no need to keep unmodified pairs; FIXME: remove earlier? */
1547 + /* no need to keep unmodified pairs */
1548 pair_to_free = p;
1549
1550 if (pair_to_free)
merge-ort.c
+5 -3
@@ -2533,7 +2533,7 @@ static int compare_pairs(const void *a_, const void *b_)
2533 return strcmp(a->one->path, b->one->path);
2534 }
2535
2536 -/* Call diffcore_rename() to compute which files have changed on given side */
2536 +/* Call diffcore_rename() to update deleted/added pairs into rename pairs */
2537 static void detect_regular_renames(struct merge_options *opt,
2538 unsigned side_index)
2539 {
@@ -2586,8 +2586,10 @@ static void detect_regular_renames(struct merge_options *opt,
2586 }
2587
2588 /*
2589 - * Get information of all renames which occurred in 'side_pairs', discarding
2590 - * non-renames.
2589 + * Get information of all renames which occurred in 'side_pairs', making use
2590 + * of any implicit directory renames in side_dir_renames (also making use of
2591 + * implicit directory renames rename_exclusions as needed by
2592 + * check_for_directory_rename()). Add all (updated) renames into result.
2593 */
2594 static int collect_renames(struct merge_options *opt,
2595 struct diff_queue_struct *result,
t/t6423-merge-rename-directories.sh
+1 -1
@@ -454,7 +454,7 @@ test_expect_success '1f: Split a directory into two other directories' '
454 # the directory renamed, but the files within it. (see 1b)
455 #
456 # If renames split a directory into two or more others, the directory
457 -# with the most renames, "wins" (see 1c). However, see the testcases
457 +# with the most renames, "wins" (see 1f). However, see the testcases
458 # in section 2, plus testcases 3a and 4a.
459 ###########################################################################
460