Merge branch 'jk/prune-top-level-refs-after-packing' into maint

diff --git a/string-list.h b/string-list.h
index de6769c92dd109791c872b8d320c2caeee9f2b8d..494eb5d95de0e5e8d69705f7a6f4fe2efcb232ad 100644 (file)
--- a/string-list.h
+++ b/string-list.h
@@ -15,8 +15,10 @@ struct string_list {
        compare_strings_fn cmp; /* NULL uses strcmp() */
 };
 
-#define STRING_LIST_INIT_NODUP { NULL, 0, 0, 0 }
-#define STRING_LIST_INIT_DUP   { NULL, 0, 0, 1 }
+#define STRING_LIST_INIT_NODUP { NULL, 0, 0, 0, NULL }
+#define STRING_LIST_INIT_DUP   { NULL, 0, 0, 1, NULL }
+
+void string_list_init(struct string_list *list, int strdup_strings);
 
 void print_string_list(const struct string_list *p, const char *text);
 void string_list_clear(struct string_list *list, int free_util);