Merge branch 'nd/lockfile-absolute'

diff --git a/builtin/apply.c b/builtin/apply.c
index 28d24f8e34c041c5afff4c659efbfeed4d5dc8c2..0aad91283959bce51aba596c6f3d2d0925e5ba92 100644 (file)
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -4180,7 +4180,7 @@ static int write_out_results(struct patch *list)
        if (cpath.nr) {
                struct string_list_item *item;
 
-               sort_string_list(&cpath);
+               string_list_sort(&cpath);
                for_each_string_list_item(item, &cpath)
                        fprintf(stderr, "U %s\n", item->string);
                string_list_clear(&cpath, 0);