summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--builtin-grep.c1
-rwxr-xr-xt/t7002-grep.sh12
2 files changed, 13 insertions, 0 deletions
diff --git a/builtin-grep.c b/builtin-grep.c
index 25ee75d989..04ac60a29a 100644
--- a/builtin-grep.c
+++ b/builtin-grep.c
@@ -232,6 +232,7 @@ static int exec_grep(int argc, const char **argv)
int status;
argv[argc] = NULL;
+ trace_argv_printf(argv, "trace: grep:");
pid = fork();
if (pid < 0)
return pid;
diff --git a/t/t7002-grep.sh b/t/t7002-grep.sh
index 23eeb767f9..99142fd6bd 100755
--- a/t/t7002-grep.sh
+++ b/t/t7002-grep.sh
@@ -340,4 +340,16 @@ test_expect_success 'grep -p -B5' '
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