Merge branch 'maint'

diff --git a/string-list.h b/string-list.h
index 5efd07b44e020428326ff32ff258449ec347861f..c50b0d0deac086cd5a50a5c021103a5f5e76c1cd 100644 (file)
--- a/string-list.h
+++ b/string-list.h
@@ -38,6 +38,13 @@ int for_each_string_list(struct string_list *list,
 void filter_string_list(struct string_list *list, int free_util,
                        string_list_each_func_t want, void *cb_data);
 
+/*
+ * Remove any empty strings from the list.  If free_util is true, call
+ * free() on the util members of any items that have to be deleted.
+ * Preserve the order of the items that are retained.
+ */
+void string_list_remove_empty_items(struct string_list *list, int free_util);
+
 /*
  * Return the longest string in prefixes that is a prefix (in the
  * sense of prefixcmp()) of string, or NULL if no such prefix exists.