From 93ba78d6f4632ef1c5228965e3edc8c0faf88c1e Mon Sep 17 00:00:00 2001
From: Vincent Ambo <tazjin@google.com>
Date: Tue, 26 May 2020 00:06:52 +0100
Subject: revert(3p/git): Revert merge of git upstream at v2.26.2

This causes cgit to serve error pages, which is undesirable.

This reverts commit 5229c9b232de5bfa959ad6ebbb4c8192ac513352, reversing
changes made to f2b211131f2347342dde63975b09cf603149f1a3.
---
 third_party/git/Documentation/git-receive-pack.txt | 52 ++++++++++------------
 1 file changed, 24 insertions(+), 28 deletions(-)

(limited to 'third_party/git/Documentation/git-receive-pack.txt')

diff --git a/third_party/git/Documentation/git-receive-pack.txt b/third_party/git/Documentation/git-receive-pack.txt
index 25702ed73072..dedf97efbb22 100644
--- a/third_party/git/Documentation/git-receive-pack.txt
+++ b/third_party/git/Documentation/git-receive-pack.txt
@@ -165,31 +165,29 @@ ref listing the commits pushed to the repository, and logs the push
 certificates of signed pushes with good signatures to a logger
 service:
 
-----
-#!/bin/sh
-# mail out commit update information.
-while read oval nval ref
-do
-	if expr "$oval" : '0*$' >/dev/null
+	#!/bin/sh
+	# mail out commit update information.
+	while read oval nval ref
+	do
+		if expr "$oval" : '0*$' >/dev/null
+		then
+			echo "Created a new ref, with the following commits:"
+			git rev-list --pretty "$nval"
+		else
+			echo "New commits:"
+			git rev-list --pretty "$nval" "^$oval"
+		fi |
+		mail -s "Changes to ref $ref" commit-list@mydomain
+	done
+	# log signed push certificate, if any
+	if test -n "${GIT_PUSH_CERT-}" && test ${GIT_PUSH_CERT_STATUS} = G
 	then
-		echo "Created a new ref, with the following commits:"
-		git rev-list --pretty "$nval"
-	else
-		echo "New commits:"
-		git rev-list --pretty "$nval" "^$oval"
-	fi |
-	mail -s "Changes to ref $ref" commit-list@mydomain
-done
-# log signed push certificate, if any
-if test -n "${GIT_PUSH_CERT-}" && test ${GIT_PUSH_CERT_STATUS} = G
-then
-	(
-		echo expected nonce is ${GIT_PUSH_NONCE}
-		git cat-file blob ${GIT_PUSH_CERT}
-	) | mail -s "push certificate from $GIT_PUSH_CERT_SIGNER" push-log@mydomain
-fi
-exit 0
-----
+		(
+			echo expected nonce is ${GIT_PUSH_NONCE}
+			git cat-file blob ${GIT_PUSH_CERT}
+		) | mail -s "push certificate from $GIT_PUSH_CERT_SIGNER" push-log@mydomain
+	fi
+	exit 0
 
 The exit code from this hook invocation is ignored, however a
 non-zero exit code will generate an error message.
@@ -214,10 +212,8 @@ anyway.
 This hook can be used, for example, to run `git update-server-info`
 if the repository is packed and is served via a dumb transport.
 
-----
-#!/bin/sh
-exec git update-server-info
-----
+	#!/bin/sh
+	exec git update-server-info
 
 
 QUARANTINE ENVIRONMENT
-- 
cgit 1.4.1