diff options
| author | Elijah Newren <newren@gmail.com> | 2021-06-08 16:11:41 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-06-09 02:40:04 (GMT) |
| commit | 356da0f98b2c6631b72e69d8638517dd849d28f8 (patch) | |
| tree | 0ea7e8292019e5386086615aba200df412b9cdfe /merge-ort.c | |
| parent | 61bf4490afffb946787edec63b932551b3089d27 (diff) | |
| download | git-356da0f98b2c6631b72e69d8638517dd849d28f8.zip git-356da0f98b2c6631b72e69d8638517dd849d28f8.tar.gz git-356da0f98b2c6631b72e69d8638517dd849d28f8.tar.bz2 | |
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>
Diffstat (limited to 'merge-ort.c')
| -rw-r--r-- | merge-ort.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/merge-ort.c b/merge-ort.c index be80143..a3bb3e1 100644 --- a/merge-ort.c +++ b/merge-ort.c @@ -2533,7 +2533,7 @@ static int compare_pairs(const void *a_, const void *b_) return strcmp(a->one->path, b->one->path); } -/* Call diffcore_rename() to compute which files have changed on given side */ +/* Call diffcore_rename() to update deleted/added pairs into rename pairs */ static void detect_regular_renames(struct merge_options *opt, unsigned side_index) { @@ -2586,8 +2586,10 @@ static void detect_regular_renames(struct merge_options *opt, } /* - * Get information of all renames which occurred in 'side_pairs', discarding - * non-renames. + * Get information of all renames which occurred in 'side_pairs', making use + * of any implicit directory renames in side_dir_renames (also making use of + * implicit directory renames rename_exclusions as needed by + * check_for_directory_rename()). Add all (updated) renames into result. */ static int collect_renames(struct merge_options *opt, struct diff_queue_struct *result, |