diff options
| author | Eric Wong <e@80x24.org> | 2019-10-06 23:30:31 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-10-07 10:20:10 +0900 |
| commit | 28ee7941280828f9e528bd8c5d0f6515a57e0c44 (patch) | |
| tree | 8ccc5bad88aad148e83cccfd1835752188d8640a /merge-recursive.c | |
| parent | b6c5241606e67b57470e86ccf547d4ab90008a1d (diff) | |
| download | git-28ee7941280828f9e528bd8c5d0f6515a57e0c44.tar.gz | |
hashmap_remove takes "const struct hashmap_entry *"
This is less error-prone than "const void *" as the compiler
now detects invalid types being passed.
Signed-off-by: Eric Wong <e@80x24.org>
Reviewed-by: Derrick Stolee <stolee@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 2d31a3e279..f60451d396 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -2001,7 +2001,7 @@ static void remove_hashmap_entries(struct hashmap *dir_renames, for (i = 0; i < items_to_remove->nr; i++) { entry = items_to_remove->items[i].util; - hashmap_remove(dir_renames, entry, NULL); + hashmap_remove(dir_renames, &entry->ent, NULL); } string_list_clear(items_to_remove, 0); } |