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/t/lib-log-graph.sh | 28 ----------------------------
 1 file changed, 28 deletions(-)
 delete mode 100755 third_party/git/t/lib-log-graph.sh

(limited to 'third_party/git/t/lib-log-graph.sh')

diff --git a/third_party/git/t/lib-log-graph.sh b/third_party/git/t/lib-log-graph.sh
deleted file mode 100755
index 1184cceef262..000000000000
--- a/third_party/git/t/lib-log-graph.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-# Helps shared by the test scripts for comparing log graphs.
-
-sanitize_log_output () {
-	sed -e 's/ *$//' \
-	    -e 's/commit [0-9a-f]*$/commit COMMIT_OBJECT_NAME/' \
-	    -e 's/Merge: [ 0-9a-f]*$/Merge: MERGE_PARENTS/' \
-	    -e 's/Merge tag.*/Merge HEADS DESCRIPTION/' \
-	    -e 's/Merge commit.*/Merge HEADS DESCRIPTION/' \
-	    -e 's/index [0-9a-f]*\.\.[0-9a-f]*/index BEFORE..AFTER/'
-}
-
-lib_test_cmp_graph () {
-	git log --graph "$@" >output &&
-	sed 's/ *$//' >output.sanitized <output &&
-	test_i18ncmp expect output.sanitized
-}
-
-lib_test_cmp_short_graph () {
-	git log --graph --pretty=short "$@" >output &&
-	sanitize_log_output >output.sanitized <output &&
-	test_i18ncmp expect output.sanitized
-}
-
-lib_test_cmp_colored_graph () {
-	git log --graph --color=always "$@" >output.colors.raw &&
-	test_decode_color <output.colors.raw | sed "s/ *\$//" >output.colors &&
-	test_cmp expect.colors output.colors
-}
-- 
cgit 1.4.1