Git 1.8.1.4

diff --git a/string-list.c b/string-list.c
index c54b816244f69614c67c532d20719081a4b34bd4..480173fe6dbee5428e3b135ff27ba7551c527ad8 100644 (file)
--- a/string-list.c
+++ b/string-list.c
@@ -136,24 +136,13 @@ void filter_string_list(struct string_list *list, int free_util,
        list->nr = dst;
 }
 
-char *string_list_longest_prefix(const struct string_list *prefixes,
-                                const char *string)
+static int item_is_not_empty(struct string_list_item *item, void *unused)
 {
-       int i, max_len = -1;
-       char *retval = NULL;
-
-       for (i = 0; i < prefixes->nr; i++) {
-               char *prefix = prefixes->items[i].string;
-               if (!prefixcmp(string, prefix)) {
-                       int len = strlen(prefix);
-                       if (len > max_len) {
-                               retval = prefix;
-                               max_len = len;
-                       }
-               }
-       }
+       return *item->string != '\0';
+}
 
-       return retval;
+void string_list_remove_empty_items(struct string_list *list, int free_util) {
+       filter_string_list(list, free_util, item_is_not_empty, NULL);
 }
 
 void string_list_clear(struct string_list *list, int free_util)