branch: don't mix --edit-description

[thirdparty/git.git] / urlmatch.c

diff --git a/urlmatch.c b/urlmatch.c
index 3e42bd750485d67bb6151ab5f15ac09a0d887502..29272a5c4f4d4a1785b66cb3c3a213c911d0883b 100644 (file)
--- a/urlmatch.c
+++ b/urlmatch.c
@@ -557,6 +557,8 @@ int urlmatch_config_entry(const char *var, const char *value, void *cb)
        const char *key, *dot;
        struct strbuf synthkey = STRBUF_INIT;
        int retval;
+       int (*select_fn)(const struct urlmatch_item *a, const struct urlmatch_item *b) =
+               collect->select_fn ? collect->select_fn : cmp_matches;
 
        if (!skip_prefix(var, collect->section, &key) || *(key++) != '.') {
                if (collect->cascade_fn)
@@ -587,7 +589,7 @@ int urlmatch_config_entry(const char *var, const char *value, void *cb)
        if (!item->util) {
                item->util = xcalloc(1, sizeof(matched));
        } else {
-               if (cmp_matches(&matched, item->util) < 0)
+               if (select_fn(&matched, item->util) < 0)
                         /*
                          * Our match is worse than the old one,
                          * we cannot use it.