about summary refs log tree commit diff
path: root/third_party/git/t/t7814-grep-recurse-submodules.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/t7814-grep-recurse-submodules.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/t7814-grep-recurse-submodules.sh')
-rwxr-xr-xthird_party/git/t/t7814-grep-recurse-submodules.sh32
1 files changed, 1 insertions, 31 deletions
diff --git a/third_party/git/t/t7814-grep-recurse-submodules.sh b/third_party/git/t/t7814-grep-recurse-submodules.sh
index 828cb3ba5818..a11366b4cee4 100755
--- a/third_party/git/t/t7814-grep-recurse-submodules.sh
+++ b/third_party/git/t/t7814-grep-recurse-submodules.sh
@@ -345,16 +345,7 @@ test_incompatible_with_recurse_submodules ()
 }
 
 test_incompatible_with_recurse_submodules --untracked
-
-test_expect_success 'grep --recurse-submodules --no-index ignores --recurse-submodules' '
-	git grep --recurse-submodules --no-index -e "^(.|.)[\d]" >actual &&
-	cat >expect <<-\EOF &&
-	a:(1|2)d(3|4)
-	submodule/a:(1|2)d(3|4)
-	submodule/sub/a:(1|2)d(3|4)
-	EOF
-	test_cmp expect actual
-'
+test_incompatible_with_recurse_submodules --no-index
 
 test_expect_success 'grep --recurse-submodules should pass the pattern type along' '
 	# Fixed
@@ -417,25 +408,4 @@ test_expect_success 'grep --recurse-submodules with submodules without .gitmodul
 	test_cmp expect actual
 '
 
-reset_and_clean () {
-	git reset --hard &&
-	git clean -fd &&
-	git submodule foreach --recursive 'git reset --hard' &&
-	git submodule foreach --recursive 'git clean -fd'
-}
-
-test_expect_success 'grep --recurse-submodules without --cached considers worktree modifications' '
-	reset_and_clean &&
-	echo "A modified line in submodule" >>submodule/a &&
-	echo "submodule/a:A modified line in submodule" >expect &&
-	git grep --recurse-submodules "A modified line in submodule" >actual &&
-	test_cmp expect actual
-'
-
-test_expect_success 'grep --recurse-submodules with --cached ignores worktree modifications' '
-	reset_and_clean &&
-	echo "A modified line in submodule" >>submodule/a &&
-	test_must_fail git grep --recurse-submodules --cached "A modified line in submodule" >actual 2>&1 &&
-	test_must_be_empty actual
-'
 test_done