hashmap: add simplified hashmap_get_from_hash() API

diff --git a/rerere.c b/rerere.c
index 34a21c431bef5c5915be77a2a0a2b8fc238bd6ac..d55aa8a01b4a4f200f24972795f2887644a06d43 100644 (file)
--- a/rerere.c
+++ b/rerere.c
@@ -673,7 +673,7 @@ int rerere_forget(struct pathspec *pathspec)
        for (i = 0; i < conflict.nr; i++) {
                struct string_list_item *it = &conflict.items[i];
                if (!match_pathspec(pathspec, it->string,
-                                   strlen(it->string), 0, NULL))
+                                   strlen(it->string), 0, NULL, 0))
                        continue;
                rerere_forget_one_path(it->string, &merge_rr);
        }