]> git.ipfire.org Git - thirdparty/git.git/commit
merge-ort: fix accidental strset<->strintmap
authorElijah Newren <newren@gmail.com>
Sun, 16 Mar 2025 06:58:58 +0000 (06:58 +0000)
committerJunio C Hamano <gitster@pobox.com>
Mon, 17 Mar 2025 22:39:03 +0000 (15:39 -0700)
commit5692a46b098adf172c641c02f920589fc33d01a4
tree5c9ae86ef5f86235b61423d6b30950d4c84ab67b
parenta373f93370a9c8980f02d24ab06a333cec67f89b
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>
merge-ort.c