about summary refs log tree commit diff
path: root/third_party/git/urlmatch.h
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@google.com>2020-05-25T23·06+0100
committerVincent Ambo <tazjin@google.com>2020-05-25T23·06+0100
commit93ba78d6f4632ef1c5228965e3edc8c0faf88c1e (patch)
tree85730c182a9f5f492ade8e8ccdb1c2356f9900bd /third_party/git/urlmatch.h
parent6f8fbf4aa4b1654ab27d4829e114538761817de0 (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.h')
-rw-r--r--third_party/git/urlmatch.h9
1 files changed, 0 insertions, 9 deletions
diff --git a/third_party/git/urlmatch.h b/third_party/git/urlmatch.h
index 2407520731f9..eed5f292354c 100644
--- a/third_party/git/urlmatch.h
+++ b/third_party/git/urlmatch.h
@@ -50,15 +50,6 @@ struct urlmatch_config {
 	void *cb;
 	int (*collect_fn)(const char *var, const char *value, void *cb);
 	int (*cascade_fn)(const char *var, const char *value, void *cb);
-	/*
-	 * Compare the two matches, the one just discovered and the existing
-	 * best match and return a negative value if the found item is to be
-	 * rejected or a non-negative value if it is to be accepted.  If this
-	 * field is set to NULL, use the default comparison technique, which
-	 * checks to ses if found is better (according to the urlmatch
-	 * specificity rules) than existing.
-	 */
-	int (*select_fn)(const struct urlmatch_item *found, const struct urlmatch_item *existing);
 };
 
 int urlmatch_config_entry(const char *var, const char *value, void *cb);