From: Nguyễn Thái Ngọc Duy Date: Mon, 04 Jan 2010 12:34:15 GMT Subject: [PATCH 2/2] t7002: add tests for skip-worktree fixes in commit a67e281 Message-ID: <1262608455-4045-2-git-send-email-pclouds@gmail.com> In-Reply-To: <7v7hs09tpi.fsf@alter.siamese.dyndns.org> Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin-grep.c | 1 + t/t7002-grep.sh | 12 ++++++++++++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/builtin-grep.c b/builtin-grep.c index f093b60..59c4b12 100644 --- a/builtin-grep.c +++ b/builtin-grep.c @@ -222,6 +222,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 ffda0df..ac0a658 100755 --- a/t/t7002-grep.sh +++ b/t/t7002-grep.sh @@ -438,4 +438,16 @@ test_expect_success 'grep -Fi' ' test_cmp expected actual ' +test_expect_success external-grep 'external grep is called' ' + GIT_TRACE=2 git grep foo >/dev/null 2>actual && + grep "trace: grep:.*foo" actual >/dev/null +' + +test_expect_success external-grep '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 -- 1.6.6.315.g1a406