diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-03-29 16:39:10 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-03-29 16:39:10 +0900 |
| commit | ff926a6d1b37a8c7c675bc8f8931474bdb525e8c (patch) | |
| tree | 3c1c6f5b2836e5b006540bba530667877cc372a5 /merge-ort.c | |
| parent | Merge branch 'rs/xdiff-context-length-fix' (diff) | |
| parent | merge-ort: remove extraneous word in comment (diff) | |
| download | git-ff926a6d1b37a8c7c675bc8f8931474bdb525e8c.tar.gz git-ff926a6d1b37a8c7c675bc8f8931474bdb525e8c.zip | |
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
Diffstat (limited to 'merge-ort.c')
| -rw-r--r-- | merge-ort.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/merge-ort.c b/merge-ort.c index e328511e19..2b7d86aa4e 100644 --- a/merge-ort.c +++ b/merge-ort.c @@ -1517,8 +1517,8 @@ static int handle_deferred_entries(struct merge_options *opt, struct strintmap copy; /* Loop over the set of paths we need to know rename info for */ - strset_for_each_entry(&renames->relevant_sources[side], - &iter, entry) { + strintmap_for_each_entry(&renames->relevant_sources[side], + &iter, entry) { char *rename_target, *dir, *dir_marker; struct strmap_entry *e; @@ -3430,9 +3430,9 @@ static int collect_renames(struct merge_options *opt, 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 |