admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'en/random-cleanups'

Browse Source 
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
This commit is contained in:
Junio C Hamano
2025-03-29 16:39:10 +09:00
parent 6767149eca a18c18b470
commit ff926a6d1b
4 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
merge-ort.c
View File

@@ -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