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.

1 files changed, 2 insertions, 24 deletions

diff --git a/third_party/git/quote.c b/third_party/git/quote.c
index bcc0dbc50d9b..7f2aa6faa43f 100644
--- a/third_party/git/quote.c
+++ b/third_party/git/quote.c
@@ -48,14 +48,8 @@ void sq_quote_buf_pretty(struct strbuf *dst, const char *src)
 	static const char ok_punct[] = "+,-./:=@_^";
 	const char *p;
 
-	/* Avoid losing a zero-length string by adding '' */
-	if (!*src) {
-		strbuf_addstr(dst, "''");
-		return;
-	}
-
 	for (p = src; *p; p++) {
-		if (!isalnum(*p) && !strchr(ok_punct, *p)) {
+		if (!isalpha(*p) && !isdigit(*p) && !strchr(ok_punct, *p)) {
 			sq_quote_buf(dst, src);
 			return;
 		}
@@ -90,28 +84,12 @@ void sq_quote_argv(struct strbuf *dst, const char **argv)
 	}
 }
 
-/*
- * Legacy function to append each argv value, quoted as necessasry,
- * with whitespace before each value.  This results in a leading
- * space in the result.
- */
 void sq_quote_argv_pretty(struct strbuf *dst, const char **argv)
 {
-	if (argv[0])
-		strbuf_addch(dst, ' ');
-	sq_append_quote_argv_pretty(dst, argv);
-}
-
-/*
- * Append each argv value, quoted as necessary, with whitespace between them.
- */
-void sq_append_quote_argv_pretty(struct strbuf *dst, const char **argv)
-{
 	int i;
 
 	for (i = 0; argv[i]; i++) {
-		if (i > 0)
-			strbuf_addch(dst, ' ');
+		strbuf_addch(dst, ' ');
 		sq_quote_buf_pretty(dst, argv[i]);
 	}
 }