undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

grep: fix worktree setup

Browse Source 
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 <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy 2008-08-28 20:04:30 +07:00 committed by Junio C Hamano
parent 4f38f6b5ba
commit 6577f542b3
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
builtin-grep.c
View File

@ -783,8 +783,11 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
paths[1] = NULL; paths[1] = NULL;
} }
if (!list.nr) if (!list.nr) {
if (!cached)
setup_work_tree();
return !grep_cache(&opt, paths, cached); return !grep_cache(&opt, paths, cached);
}
if (cached) if (cached)
die("both --cached and trees are given."); die("both --cached and trees are given.");

5
t/t1501-worktree.sh
View File

@ -169,4 +169,9 @@ test_expect_success 'git diff' '
test_cmp diff-FILES.expected result test_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 test_done