# [PATCH] grep: fix worktree setup 1 messages from 2008-08-28 to 2008-08-28. Participants: Nguyễn Thái Ngọc Duy. Thread: https://gitlist.dev/t/15245 ## Nguyễn Thái Ngọc Duy, 2008-08-28 13:04 Subject: [PATCH] grep: fix worktree setup Message-ID: <1219928670-25219-1-git-send-email-pclouds@gmail.com> URL: https://gitlist.dev/e/1219928670-25219-1-git-send-email-pclouds%40gmail.com ``` Unless used with --cached or grepping on a tree, "git grep" will search on working directory, so set up worktree properly Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin-grep.c | 5 ++++- t/t1501-worktree.sh | 5 +++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/builtin-grep.c b/builtin-grep.c index 631129d..3ded1ba 100644 --- a/builtin-grep.c +++ b/builtin-grep.c @@ -783,8 +783,11 @@ int cmd_grep(int argc, const char **argv, const char *prefix) paths[1] = NULL; } - if (!list.nr) + if (!list.nr) { + if (!cached) + setup_work_tree(); return !grep_cache(&opt, paths, cached); + } if (cached) die("both --cached and trees are given."); diff --git a/t/t1501-worktree.sh b/t/t1501-worktree.sh index e9e352c..e60116c 100755 --- a/t/t1501-worktree.sh +++ b/t/t1501-worktree.sh @@ -169,4 +169,9 @@ test_expect_success 'git diff' ' cmp diff-FILES.expected result ' +test_expect_success 'git grep' ' + (cd repo.git/work/sub && + GIT_DIR=../.. GIT_WORK_TREE=.. git grep -l changed | grep -q dir/tracked) +' + test_done -- 1.6.0.96.g2fad1.dirty ```