From: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date: Mon, 4 Jan 2010 12:34:15 +0000 (+0700)
Subject: t7002: test for not using external grep on skip-worktree paths
X-Git-Tag: v1.7.0-rc0~103^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8740773ee5ef450cefd03d3576f348fe65e92edf;p=git.git

t7002: test for not using external grep on skip-worktree paths

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/builtin-grep.c b/builtin-grep.c
index 25ee75d98..04ac60a29 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 23eeb767f..99142fd6b 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