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, 0 insertions, 57 deletions

diff --git a/third_party/git/t/t3416-rebase-onto-threedots.sh b/third_party/git/t/t3416-rebase-onto-threedots.sh
index 9c2548423bce..ddf2f6485383 100755
--- a/third_party/git/t/t3416-rebase-onto-threedots.sh
+++ b/third_party/git/t/t3416-rebase-onto-threedots.sh
@@ -99,64 +99,7 @@ test_expect_success 'rebase -i --onto master...side' '
 	git checkout side &&
 	git reset --hard K &&
 
-	set_fake_editor &&
 	test_must_fail git rebase -i --onto master...side J
 '
 
-test_expect_success 'rebase --keep-base --onto incompatible' '
-	test_must_fail git rebase --keep-base --onto master...
-'
-
-test_expect_success 'rebase --keep-base --root incompatible' '
-	test_must_fail git rebase --keep-base --root
-'
-
-test_expect_success 'rebase --keep-base master from topic' '
-	git reset --hard &&
-	git checkout topic &&
-	git reset --hard G &&
-
-	git rebase --keep-base master &&
-	git rev-parse C >base.expect &&
-	git merge-base master HEAD >base.actual &&
-	test_cmp base.expect base.actual &&
-
-	git rev-parse HEAD~2 >actual &&
-	git rev-parse C^0 >expect &&
-	test_cmp expect actual
-'
-
-test_expect_success 'rebase --keep-base master from side' '
-	git reset --hard &&
-	git checkout side &&
-	git reset --hard K &&
-
-	test_must_fail git rebase --keep-base master
-'
-
-test_expect_success 'rebase -i --keep-base master from topic' '
-	git reset --hard &&
-	git checkout topic &&
-	git reset --hard G &&
-
-	set_fake_editor &&
-	EXPECT_COUNT=2 git rebase -i --keep-base master &&
-	git rev-parse C >base.expect &&
-	git merge-base master HEAD >base.actual &&
-	test_cmp base.expect base.actual &&
-
-	git rev-parse HEAD~2 >actual &&
-	git rev-parse C^0 >expect &&
-	test_cmp expect actual
-'
-
-test_expect_success 'rebase -i --keep-base master from side' '
-	git reset --hard &&
-	git checkout side &&
-	git reset --hard K &&
-
-	set_fake_editor &&
-	test_must_fail git rebase -i --keep-base master
-'
-
 test_done