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/t6026-merge-attr.sh | 46 +++++++++++++++++------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

(limited to 'third_party/git/t/t6026-merge-attr.sh')

diff --git a/third_party/git/t/t6026-merge-attr.sh b/third_party/git/t/t6026-merge-attr.sh
index 5900358ce9c0..8f9b48a4937b 100755
--- a/third_party/git/t/t6026-merge-attr.sh
+++ b/third_party/git/t/t6026-merge-attr.sh
@@ -32,29 +32,7 @@ test_expect_success setup '
 	test_tick &&
 	git commit -m Side &&
 
-	git tag anchor &&
-
-	cat >./custom-merge <<-\EOF &&
-	#!/bin/sh
-
-	orig="$1" ours="$2" theirs="$3" exit="$4" path=$5
-	(
-		echo "orig is $orig"
-		echo "ours is $ours"
-		echo "theirs is $theirs"
-		echo "path is $path"
-		echo "=== orig ==="
-		cat "$orig"
-		echo "=== ours ==="
-		cat "$ours"
-		echo "=== theirs ==="
-		cat "$theirs"
-	) >"$ours+"
-	cat "$ours+" >"$ours"
-	rm -f "$ours+"
-	exit "$exit"
-	EOF
-	chmod +x ./custom-merge
+	git tag anchor
 '
 
 test_expect_success merge '
@@ -104,6 +82,28 @@ test_expect_success 'retry the merge with longer context' '
 	grep "<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<" actual
 '
 
+cat >./custom-merge <<\EOF
+#!/bin/sh
+
+orig="$1" ours="$2" theirs="$3" exit="$4" path=$5
+(
+	echo "orig is $orig"
+	echo "ours is $ours"
+	echo "theirs is $theirs"
+	echo "path is $path"
+	echo "=== orig ==="
+	cat "$orig"
+	echo "=== ours ==="
+	cat "$ours"
+	echo "=== theirs ==="
+	cat "$theirs"
+) >"$ours+"
+cat "$ours+" >"$ours"
+rm -f "$ours+"
+exit "$exit"
+EOF
+chmod +x ./custom-merge
+
 test_expect_success 'custom merge backend' '
 
 	echo "* merge=union" >.gitattributes &&
-- 
cgit 1.4.1