about summary refs log tree commit diff
path: root/third_party/git/t/t3005-ls-files-relative.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/t3005-ls-files-relative.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/t3005-ls-files-relative.sh')
-rwxr-xr-xthird_party/git/t/t3005-ls-files-relative.sh12
1 files changed, 8 insertions, 4 deletions
diff --git a/third_party/git/t/t3005-ls-files-relative.sh b/third_party/git/t/t3005-ls-files-relative.sh
index 2ec69a8a266f..209b4c7cd8c6 100755
--- a/third_party/git/t/t3005-ls-files-relative.sh
+++ b/third_party/git/t/t3005-ls-files-relative.sh
@@ -7,6 +7,10 @@ This test runs git ls-files with various relative path arguments.
 
 . ./test-lib.sh
 
+new_line='
+'
+sq=\'
+
 test_expect_success 'prepare' '
 	: >never-mind-me &&
 	git add never-mind-me &&
@@ -40,9 +44,9 @@ test_expect_success 'ls-files -c' '
 		cd top/sub &&
 		for f in ../y*
 		do
-			echo "error: pathspec $SQ$f$SQ did not match any file(s) known to git"
+			echo "error: pathspec $sq$f$sq did not match any file(s) known to git"
 		done >expect.err &&
-		echo "Did you forget to ${SQ}git add${SQ}?" >>expect.err &&
+		echo "Did you forget to ${sq}git add${sq}?" >>expect.err &&
 		ls ../x* >expect.out &&
 		test_must_fail git ls-files -c --error-unmatch ../[xy]* >actual.out 2>actual.err &&
 		test_cmp expect.out actual.out &&
@@ -55,9 +59,9 @@ test_expect_success 'ls-files -o' '
 		cd top/sub &&
 		for f in ../x*
 		do
-			echo "error: pathspec $SQ$f$SQ did not match any file(s) known to git"
+			echo "error: pathspec $sq$f$sq did not match any file(s) known to git"
 		done >expect.err &&
-		echo "Did you forget to ${SQ}git add${SQ}?" >>expect.err &&
+		echo "Did you forget to ${sq}git add${sq}?" >>expect.err &&
 		ls ../y* >expect.out &&
 		test_must_fail git ls-files -o --error-unmatch ../[xy]* >actual.out 2>actual.err &&
 		test_cmp expect.out actual.out &&