diff options
| author | Vincent Ambo <tazjin@google.com> | 2020-05-25T23·06+0100 |
|---|---|---|
| committer | Vincent Ambo <tazjin@google.com> | 2020-05-25T23·06+0100 |
| commit | 93ba78d6f4632ef1c5228965e3edc8c0faf88c1e (patch) | |
| tree | 85730c182a9f5f492ade8e8ccdb1c2356f9900bd /third_party/git/urlmatch.c | |
| parent | 6f8fbf4aa4b1654ab27d4829e114538761817de0 (diff) | |
revert(3p/git): Revert merge of git upstream at v2.26.2 r/852
This causes cgit to serve error pages, which is undesirable. This reverts commit 5229c9b232de5bfa959ad6ebbb4c8192ac513352, reversing changes made to f2b211131f2347342dde63975b09cf603149f1a3.
Diffstat (limited to 'third_party/git/urlmatch.c')
| -rw-r--r-- | third_party/git/urlmatch.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/third_party/git/urlmatch.c b/third_party/git/urlmatch.c index 29272a5c4f4d..3e42bd750485 100644 --- a/third_party/git/urlmatch.c +++ b/third_party/git/urlmatch.c @@ -557,8 +557,6 @@ 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) @@ -589,7 +587,7 @@ int urlmatch_config_entry(const char *var, const char *value, void *cb) if (!item->util) { item->util = xcalloc(1, sizeof(matched)); } else { - if (select_fn(&matched, item->util) < 0) + if (cmp_matches(&matched, item->util) < 0) /* * Our match is worse than the old one, * we cannot use it. |