diff options
| author | Elijah Newren <newren@gmail.com> | 2025-03-16 06:58:58 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-03-17 15:39:03 -0700 |
| commit | 5692a46b098adf172c641c02f920589fc33d01a4 (patch) | |
| tree | 5c9ae86ef5f86235b61423d6b30950d4c84ab67b /merge-ort.c | |
| parent | t7615: be more explicit about diff algorithm used (diff) | |
| download | git-5692a46b098adf172c641c02f920589fc33d01a4.tar.gz git-5692a46b098adf172c641c02f920589fc33d01a4.zip | |
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>
Diffstat (limited to 'merge-ort.c')
| -rw-r--r-- | merge-ort.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/merge-ort.c b/merge-ort.c index 46e78c3ffa..a12aa213b0 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; |