about summary refs log tree commit diff
path: root/third_party/git/t/t0060-path-utils.sh
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@google.com>2020-05-25T23·06+0100
committerVincent Ambo <tazjin@google.com>2020-05-25T23·06+0100
commit93ba78d6f4632ef1c5228965e3edc8c0faf88c1e (patch)
tree85730c182a9f5f492ade8e8ccdb1c2356f9900bd /third_party/git/t/t0060-path-utils.sh
parent6f8fbf4aa4b1654ab27d4829e114538761817de0 (diff)
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.
Diffstat (limited to 'third_party/git/t/t0060-path-utils.sh')
-rwxr-xr-xthird_party/git/t/t0060-path-utils.sh45
1 files changed, 1 insertions, 44 deletions
diff --git a/third_party/git/t/t0060-path-utils.sh b/third_party/git/t/t0060-path-utils.sh
index 2ea2d00c39a6..c7b53e494ba4 100755
--- a/third_party/git/t/t0060-path-utils.sh
+++ b/third_party/git/t/t0060-path-utils.sh
@@ -165,15 +165,6 @@ test_expect_success 'absolute path rejects the empty string' '
 	test_must_fail test-tool path-utils absolute_path ""
 '
 
-test_expect_success MINGW '<drive-letter>:\\abc is an absolute path' '
-	for letter in : \" C Z 1 ä
-	do
-		path=$letter:\\abc &&
-		absolute="$(test-tool path-utils absolute_path "$path")" &&
-		test "$path" = "$absolute" || return 1
-	done
-'
-
 test_expect_success 'real path rejects the empty string' '
 	test_must_fail test-tool path-utils real_path ""
 '
@@ -294,13 +285,9 @@ test_git_path GIT_OBJECT_DIRECTORY=foo objects/foo foo/foo
 test_git_path GIT_OBJECT_DIRECTORY=foo objects2 .git/objects2
 test_expect_success 'setup common repository' 'git --git-dir=bar init'
 test_git_path GIT_COMMON_DIR=bar index                    .git/index
-test_git_path GIT_COMMON_DIR=bar index.lock               .git/index.lock
 test_git_path GIT_COMMON_DIR=bar HEAD                     .git/HEAD
 test_git_path GIT_COMMON_DIR=bar logs/HEAD                .git/logs/HEAD
-test_git_path GIT_COMMON_DIR=bar logs/HEAD.lock           .git/logs/HEAD.lock
 test_git_path GIT_COMMON_DIR=bar logs/refs/bisect/foo     .git/logs/refs/bisect/foo
-test_git_path GIT_COMMON_DIR=bar logs/refs                bar/logs/refs
-test_git_path GIT_COMMON_DIR=bar logs/refs/               bar/logs/refs/
 test_git_path GIT_COMMON_DIR=bar logs/refs/bisec/foo      bar/logs/refs/bisec/foo
 test_git_path GIT_COMMON_DIR=bar logs/refs/bisec          bar/logs/refs/bisec
 test_git_path GIT_COMMON_DIR=bar logs/refs/bisectfoo      bar/logs/refs/bisectfoo
@@ -436,9 +423,6 @@ test_expect_success 'match .gitmodules' '
 		~1000000 \
 		~9999999 \
 		\
-		.gitmodules:\$DATA \
-		"gitmod~4 . :\$DATA" \
-		\
 		--not \
 		".gitmodules x"  \
 		".gitmodules .x" \
@@ -463,34 +447,7 @@ test_expect_success 'match .gitmodules' '
 		\
 		GI7EB~1 \
 		GI7EB~01 \
-		GI7EB~1X \
-		\
-		.gitmodules,:\$DATA
-'
-
-test_expect_success MINGW 'is_valid_path() on Windows' '
-	test-tool path-utils is_valid_path \
-		win32 \
-		"win32 x" \
-		../hello.txt \
-		C:\\git \
-		comm \
-		conout.c \
-		lptN \
-		\
-		--not \
-		"win32 "  \
-		"win32 /x "  \
-		"win32."  \
-		"win32 . ." \
-		.../hello.txt \
-		colon:test \
-		"AUX.c" \
-		"abc/conOut\$  .xyz/test" \
-		lpt8 \
-		"lpt*" \
-		Nul \
-		"PRN./abc"
+		GI7EB~1X
 '
 
 test_done