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, 47 insertions, 48 deletions

diff --git a/third_party/git/t/t6025-merge-symlinks.sh b/third_party/git/t/t6025-merge-symlinks.sh
index 6c0a90d044..433c4de08f 100755
--- a/third_party/git/t/t6025-merge-symlinks.sh
+++ b/third_party/git/t/t6025-merge-symlinks.sh
@@ -10,53 +10,52 @@ if core.symlinks is false.'
 
 . ./test-lib.sh
 
-test_expect_success 'setup' '
-	git config core.symlinks false &&
-	>file &&
-	git add file &&
-	git commit -m initial &&
-	git branch b-symlink &&
-	git branch b-file &&
-	l=$(printf file | git hash-object -t blob -w --stdin) &&
-	echo "120000 $l	symlink" | git update-index --index-info &&
-	git commit -m master &&
-	git checkout b-symlink &&
-	l=$(printf file-different | git hash-object -t blob -w --stdin) &&
-	echo "120000 $l	symlink" | git update-index --index-info &&
-	git commit -m b-symlink &&
-	git checkout b-file &&
-	echo plain-file >symlink &&
-	git add symlink &&
-	git commit -m b-file
-'
-
-test_expect_success 'merge master into b-symlink, which has a different symbolic link' '
-	git checkout b-symlink &&
-	test_must_fail git merge master
-'
-
-test_expect_success 'the merge result must be a file' '
-	test_path_is_file symlink
-'
-
-test_expect_success 'merge master into b-file, which has a file instead of a symbolic link' '
-	git reset --hard &&
-	git checkout b-file &&
-	test_must_fail git merge master
-'
-
-test_expect_success 'the merge result must be a file' '
-	test_path_is_file symlink
-'
-
-test_expect_success 'merge b-file, which has a file instead of a symbolic link, into master' '
-	git reset --hard &&
-	git checkout master &&
-	test_must_fail git merge b-file
-'
-
-test_expect_success 'the merge result must be a file' '
-	test_path_is_file symlink
-'
+test_expect_success \
+'setup' '
+git config core.symlinks false &&
+> file &&
+git add file &&
+git commit -m initial &&
+git branch b-symlink &&
+git branch b-file &&
+l=$(printf file | git hash-object -t blob -w --stdin) &&
+echo "120000 $l	symlink" | git update-index --index-info &&
+git commit -m master &&
+git checkout b-symlink &&
+l=$(printf file-different | git hash-object -t blob -w --stdin) &&
+echo "120000 $l	symlink" | git update-index --index-info &&
+git commit -m b-symlink &&
+git checkout b-file &&
+echo plain-file > symlink &&
+git add symlink &&
+git commit -m b-file'
+
+test_expect_success \
+'merge master into b-symlink, which has a different symbolic link' '
+git checkout b-symlink &&
+test_must_fail git merge master'
+
+test_expect_success \
+'the merge result must be a file' '
+test -f symlink'
+
+test_expect_success \
+'merge master into b-file, which has a file instead of a symbolic link' '
+git reset --hard && git checkout b-file &&
+test_must_fail git merge master'
+
+test_expect_success \
+'the merge result must be a file' '
+test -f symlink'
+
+test_expect_success \
+'merge b-file, which has a file instead of a symbolic link, into master' '
+git reset --hard &&
+git checkout master &&
+test_must_fail git merge b-file'
+
+test_expect_success \
+'the merge result must be a file' '
+test -f symlink'
 
 test_done