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.
---
 .../git/t/t3433-rebase-across-mode-change.sh       | 48 ----------------------
 1 file changed, 48 deletions(-)
 delete mode 100755 third_party/git/t/t3433-rebase-across-mode-change.sh

(limited to 'third_party/git/t/t3433-rebase-across-mode-change.sh')

diff --git a/third_party/git/t/t3433-rebase-across-mode-change.sh b/third_party/git/t/t3433-rebase-across-mode-change.sh
deleted file mode 100755
index 05df964670..0000000000
--- a/third_party/git/t/t3433-rebase-across-mode-change.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/sh
-
-test_description='git rebase across mode change'
-
-. ./test-lib.sh
-
-test_expect_success 'setup' '
-	mkdir DS &&
-	>DS/whatever &&
-	git add DS &&
-	git commit -m base &&
-
-	git branch side1 &&
-	git branch side2 &&
-
-	git checkout side1 &&
-	git rm -rf DS &&
-	test_ln_s_add unrelated DS &&
-	git commit -m side1 &&
-
-	git checkout side2 &&
-	>unrelated &&
-	git add unrelated &&
-	git commit -m commit1 &&
-
-	echo >>unrelated &&
-	git commit -am commit2
-'
-
-test_expect_success 'rebase changes with the apply backend' '
-	test_when_finished "git rebase --abort || true" &&
-	git checkout -b apply-backend side2 &&
-	git rebase side1
-'
-
-test_expect_success 'rebase changes with the merge backend' '
-	test_when_finished "git rebase --abort || true" &&
-	git checkout -b merge-backend side2 &&
-	git rebase -m side1
-'
-
-test_expect_success 'rebase changes with the merge backend with a delay' '
-	test_when_finished "git rebase --abort || true" &&
-	git checkout -b merge-delay-backend side2 &&
-	git rebase -m --exec "sleep 1" side1
-'
-
-test_done
-- 
cgit 1.4.1