merge-ort: fix accidental strset<->strintmap
Both strset_for_each_entry and strintmap_for_each_entry are macros that evaluate to the same thing, so they are technically interchangeable. However, the intent is that we use the one matching the variable type we are passing. Unfortunately, I somehow mistakenly got one of these wrong in 7bee6c100431 (merge-ort: avoid recursing into directories when we don't need to, 2021-07-16) -- possibly related to the fact that relevant_sources was initially a strset and later refactored into a strintmap. Correct which macro we use. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Elijah Newren committed
Mar 16, 2025 at 06:58 UTC
5692a46b098adf172c641c02f920589fc33d01a4
1 file changed
+2
-2
merge-ort.c
+2
-2
@@ -1517,8 +1517,8 @@ static int handle_deferred_entries(struct merge_options *opt,
1517
struct strintmap copy;
1518
1519
/* Loop over the set of paths we need to know rename info for */
1520
- strset_for_each_entry(&renames->relevant_sources[side],
1521
- &iter, entry) {
1520
+ strintmap_for_each_entry(&renames->relevant_sources[side],
1521
+ &iter, entry) {
1522
char *rename_target, *dir, *dir_marker;
1523
struct strmap_entry *e;
1524