diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2008-08-28 20:04:30 +0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-28 22:46:16 -0700 |
| commit | 6577f542b3ab64594c7d7a7db752e96be7234fb0 (patch) | |
| tree | 2632bcaa41c70b3e1192739c95e6433d35ac9f33 | |
| parent | 4f38f6b5bafb1f7f85c7b54d0bb0a0e977cd947c (diff) | |
| download | git-6577f542b3ab64594c7d7a7db752e96be7234fb0.tar.gz | |
grep: fix worktree setup
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>
| -rw-r--r-- | builtin-grep.c | 5 | ||||
| -rwxr-xr-x | t/t1501-worktree.sh | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/builtin-grep.c b/builtin-grep.c index 631129ddfd..3ded1ba9da 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 8244b3a86f..c039ee3fd8 100755 --- a/t/t1501-worktree.sh +++ b/t/t1501-worktree.sh @@ -169,4 +169,9 @@ test_expect_success 'git diff' ' 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 |