Add `init.templatedir` configuration variable.

diff --git a/t/t7002-grep.sh b/t/t7002-grep.sh
index 76c5e091b7d45bde38f34dc9726c51034ee7f9eb..7144f815c07a46e4f39a0f739fb964467fd27a16 100755 (executable)
--- a/t/t7002-grep.sh
+++ b/t/t7002-grep.sh
@@ -8,18 +8,6 @@ test_description='git grep various.
 
 . ./test-lib.sh
 
-test_expect_success 'Check for external grep support' '
-       case "$(git grep -h 2>&1|grep ext-grep)" in
-       *"(default)"*)
-               test_set_prereq EXTGREP
-               true;;
-       *"(ignored by this build)"*)
-               true;;
-       *)
-               false;;
-       esac
-'
-
 cat >hello.c <<EOF
 #include <stdio.h>
 int main(int argc, const char **argv)
@@ -303,6 +291,14 @@ y:y yy
 z:zzz
 EOF
 
+test_expect_success 'grep -q, silently report matches' '
+       >empty &&
+       git grep -q mmap >actual &&
+       test_cmp empty actual &&
+       test_must_fail git grep -q qfwfq >actual &&
+       test_cmp empty actual
+'
+
 # Create 1024 file names that sort between "y" and "z" to make sure
 # the two files are handled by different calls to an external grep.
 # This depends on MAXARGS in builtin-grep.c being 1024 or less.
@@ -314,8 +310,8 @@ test_expect_success 'grep -C1, hunk mark between files' '
        test_cmp expected actual
 '
 
-test_expect_success 'grep -C1 --no-ext-grep, hunk mark between files' '
-       git grep -C1 --no-ext-grep "^[yz]" >actual &&
+test_expect_success 'grep -C1 hunk mark between files' '
+       git grep -C1 "^[yz]" >actual &&
        test_cmp expected actual
 '
 
@@ -371,7 +367,7 @@ test_expect_success 'log grep (6)' '
 test_expect_success 'grep with CE_VALID file' '
        git update-index --assume-unchanged t/t &&
        rm t/t &&
-       test "$(git grep --no-ext-grep test)" = "t/t:test" &&
+       test "$(git grep test)" = "t/t:test" &&
        git update-index --no-assume-unchanged t/t &&
        git checkout t/t
 '
@@ -438,16 +434,4 @@ test_expect_success 'grep -Fi' '
        test_cmp expected actual
 '
 
-test_expect_success EXTGREP 'external grep is called' '
-       GIT_TRACE=2 git grep foo >/dev/null 2>actual &&
-       grep "trace: grep:.*foo" actual >/dev/null
-'
-
-test_expect_success EXTGREP 'no external grep when skip-worktree entries exist' '
-       git update-index --skip-worktree file &&
-       GIT_TRACE=2 git grep foo >/dev/null 2>actual &&
-       ! grep "trace: grep:" actual >/dev/null &&
-       git update-index --no-skip-worktree file
-'
-
 test_done