RelNotes: mention "log: add -P as a synonym for --perl-regexp"

diff --git a/diffcore-order.c b/diffcore-order.c
index 69d41f7a5781a10e43cf0e74f20be85a0d1fc5be..19e73311f9cd830da70428439b7b6a14d5345eec 100644 (file)
--- a/diffcore-order.c
+++ b/diffcore-order.c
@@ -67,7 +67,7 @@ static int match_order(const char *path)
                strbuf_addstr(&p, path);
                while (p.buf[0]) {
                        char *cp;
-                       if (!wildmatch(order[i], p.buf, 0, NULL))
+                       if (!wildmatch(order[i], p.buf, 0))
                                return i;
                        cp = strrchr(p.buf, '/');
                        if (!cp)
@@ -101,7 +101,7 @@ void order_objects(const char *orderfile, obj_path_fn_t obj_path,
                objs[i].orig_order = i;
                objs[i].order = match_order(obj_path(objs[i].obj));
        }
-       qsort(objs, nr, sizeof(*objs), compare_objs_order);
+       QSORT(objs, nr, compare_objs_order);
 }
 
 static const char *pair_pathtwo(void *obj)