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.

4 files changed, 5 insertions, 10 deletions

diff --git a/third_party/git/compat/regex/regcomp.c b/third_party/git/compat/regex/regcomp.c
index d1bc09e49b..c0d838834a 100644
--- a/third_party/git/compat/regex/regcomp.c
+++ b/third_party/git/compat/regex/regcomp.c
@@ -3462,7 +3462,7 @@ build_equiv_class (bitset_t sbcset, const unsigned char *name)
 	/* This isn't a valid character.  */
 	return REG_ECOLLATE;
 
-      /* Build single byte matching table for this equivalence class.  */
+      /* Build single byte matcing table for this equivalence class.  */
       char_buf[1] = (unsigned char) '\0';
       len = weights[idx1 & 0xffffff];
       for (ch = 0; ch < SBC_MAX; ++ch)
diff --git a/third_party/git/compat/regex/regex.h b/third_party/git/compat/regex/regex.h
index 2d3412860d..4d81358a83 100644
--- a/third_party/git/compat/regex/regex.h
+++ b/third_party/git/compat/regex/regex.h
@@ -41,11 +41,6 @@
 extern "C" {
 #endif
 
-#define regcomp git_regcomp
-#define regexec git_regexec
-#define regerror git_regerror
-#define regfree git_regfree
-
 /* The following two types have to be signed and unsigned integer type
    wide enough to hold a value of a pointer.  For most ANSI compilers
    ptrdiff_t and size_t should be likely OK.  Still size of these two
@@ -327,7 +322,7 @@ typedef enum
   /* POSIX regcomp return error codes.  (In the order listed in the
      standard.)  */
   REG_BADPAT,		/* Invalid pattern.  */
-  REG_ECOLLATE,		/* Invalid collating element.  */
+  REG_ECOLLATE,		/* Inalid collating element.  */
   REG_ECTYPE,		/* Invalid character class name.  */
   REG_EESCAPE,		/* Trailing backslash.  */
   REG_ESUBREG,		/* Invalid back reference.  */
diff --git a/third_party/git/compat/regex/regex_internal.c b/third_party/git/compat/regex/regex_internal.c
index ec51cf3446..59bf151336 100644
--- a/third_party/git/compat/regex/regex_internal.c
+++ b/third_party/git/compat/regex/regex_internal.c
@@ -1616,7 +1616,7 @@ free_state (re_dfastate_t *state)
   re_free (state);
 }
 
-/* Create the new state which is independent of contexts.
+/* Create the new state which is independ of contexts.
    Return the new state if succeeded, otherwise return NULL.  */
 
 static re_dfastate_t *
diff --git a/third_party/git/compat/regex/regexec.c b/third_party/git/compat/regex/regexec.c
index 49358ae475..1b5d89fd5e 100644
--- a/third_party/git/compat/regex/regexec.c
+++ b/third_party/git/compat/regex/regexec.c
@@ -2420,7 +2420,7 @@ find_recover_state (reg_errcode_t *err, re_match_context_t *mctx)
 /* From the node set CUR_NODES, pick up the nodes whose types are
    OP_OPEN_SUBEXP and which have corresponding back references in the regular
    expression. And register them to use them later for evaluating the
-   corresponding back references.  */
+   correspoding back references.  */
 
 static reg_errcode_t
 internal_function
@@ -3347,7 +3347,7 @@ build_trtable (const re_dfa_t *dfa, re_dfastate_t *state)
   dests_node = dests_alloc->dests_node;
   dests_ch = dests_alloc->dests_ch;
 
-  /* Initialize transition table.  */
+  /* Initialize transiton table.  */
   state->word_trtable = state->trtable = NULL;
 
   /* At first, group all nodes belonging to `state' into several