From: Junio C Hamano Date: Sat, 29 Mar 2025 07:39:10 +0000 (+0900) Subject: Merge branch 'en/random-cleanups' X-Git-Tag: v2.50.0-rc0~159 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ff926a6d1b37a8c7c675bc8f8931474bdb525e8c;p=thirdparty%2Fgit.git Merge branch 'en/random-cleanups' Miscellaneous code clean-ups. * en/random-cleanups: merge-ort: remove extraneous word in comment merge-ort: fix accidental strset<->strintmap t7615: be more explicit about diff algorithm used t6423: fix a comment that accidentally reversed two commits stash: remove merge-recursive.h include --- ff926a6d1b37a8c7c675bc8f8931474bdb525e8c diff --cc merge-ort.c index e328511e19,9efc2285a9..2b7d86aa4e --- a/merge-ort.c +++ b/merge-ort.c @@@ -3427,12 -3421,11 +3427,12 @@@ static int collect_renames(struct merge if (new_path) apply_directory_rename_modifications(opt, p, new_path); +skip_directory_renames: /* * p->score comes back from diffcore_rename_extended() with - * the similarity of the renamed file. The similarity is - * was used to determine that the two files were related - * and are a rename, which we have already used, but beyond + * the similarity of the renamed file. The similarity was + * used to determine that the two files were related and + * are a rename, which we have already used, but beyond * that we have no use for the similarity. So p->score is * now irrelevant. However, process_renames() will need to * know which side of the merge this rename was associated