Merge branch 'jk/sanity' into maint

diff --git a/sha1_file.c b/sha1_file.c
index d7f1838c13f5a88448d0f2034347bfb6482b3edf..30995e61b38fbfd1733acc5c3c5866b61d9f09e1 100644 (file)
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -1198,7 +1198,7 @@ static void report_pack_garbage(struct string_list *list)
        if (!report_garbage)
                return;
 
-       sort_string_list(list);
+       string_list_sort(list);
 
        for (i = 0; i < list->nr; i++) {
                const char *path = list->items[i].string;