Merge branch 'ps/ref-transaction-hook'

[thirdparty/git.git] / urlmatch.c

diff --git a/urlmatch.c b/urlmatch.c
index 29272a5c4f4d4a1785b66cb3c3a213c911d0883b..33a2ccd306b6a76c29b27974da64cb7a95247264 100644 (file)
--- a/urlmatch.c
+++ b/urlmatch.c
@@ -572,10 +572,14 @@ int urlmatch_config_entry(const char *var, const char *value, void *cb)
 
                config_url = xmemdupz(key, dot - key);
                norm_url = url_normalize_1(config_url, &norm_info, 1);
+               if (norm_url)
+                       retval = match_urls(url, &norm_info, &matched);
+               else if (collect->fallback_match_fn)
+                       retval = collect->fallback_match_fn(config_url,
+                                                           collect->cb);
+               else
+                       retval = 0;
                free(config_url);
-               if (!norm_url)
-                       return 0;
-               retval = match_urls(url, &norm_info, &matched);
                free(norm_url);
                if (!retval)
                        return 0;