about summary refs log tree commit diff
path: root/third_party/git/t/t0061-run-command.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/t0061-run-command.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/t0061-run-command.sh')
-rwxr-xr-xthird_party/git/t/t0061-run-command.sh25
1 files changed, 4 insertions, 21 deletions
diff --git a/third_party/git/t/t0061-run-command.sh b/third_party/git/t/t0061-run-command.sh
index 7d599675e3..015fac8b5d 100755
--- a/third_party/git/t/t0061-run-command.sh
+++ b/third_party/git/t/t0061-run-command.sh
@@ -12,10 +12,6 @@ cat >hello-script <<-EOF
 	cat hello-script
 EOF
 
-test_expect_success MINGW 'subprocess inherits only std handles' '
-	test-tool run-command inherited-handle
-'
-
 test_expect_success 'start_command reports ENOENT (slash)' '
 	test-tool run-command start-command-ENOENT ./does-not-exist 2>err &&
 	test_i18ngrep "\./does-not-exist" err
@@ -214,23 +210,10 @@ test_expect_success MINGW 'verify curlies are quoted properly' '
 	test_cmp expect actual
 '
 
-test_expect_success MINGW 'can spawn .bat with argv[0] containing spaces' '
-	bat="$TRASH_DIRECTORY/bat with spaces in name.bat" &&
-
-	# Every .bat invocation will log its arguments to file "out"
-	rm -f out &&
-	echo "echo %* >>out" >"$bat" &&
-
-	# Ask git to invoke .bat; clone will fail due to fake SSH helper
-	test_must_fail env GIT_SSH="$bat" git clone myhost:src ssh-clone &&
-
-	# Spawning .bat can fail if there are two quoted cmd.exe arguments.
-	# .bat itself is first (due to spaces in name), so just one more is
-	# needed to verify. GIT_SSH will invoke .bat multiple times:
-	# 1) -G myhost
-	# 2) myhost "git-upload-pack src"
-	# First invocation will always succeed. Test the second one.
-	grep "git-upload-pack" out
+test_expect_success MINGW 'can spawn with argv[0] containing spaces' '
+	cp "$GIT_BUILD_DIR/t/helper/test-fake-ssh$X" ./ &&
+	test_must_fail "$PWD/test-fake-ssh$X" 2>err &&
+	grep TRASH_DIRECTORY err
 '
 
 test_done