Skip to content

Commit

Permalink
Merge pull request #864 from lexa/master
Browse files Browse the repository at this point in the history
Honor projectile-use-git-grep in helm-projectile-grep
  • Loading branch information
bbatsov committed Sep 17, 2015
2 parents 4089a46 + fa0d971 commit 43b99b7
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ This is done via the variables `projectile-project-compilation-cmd` and `project
* [#721](https://github.com/bbatsov/projectile/issues/721#issuecomment-100830507): Remove current buffer from `helm-projectile-switch-project`.
* [#667](https://github.com/bbatsov/projectile/issues/667) Use `file-truename` when caching filenames to prevent duplicate/symlinked filepaths from appearing when opening a project file.
* [#625](https://github.com/bbatsov/projectile/issues/625): Ensure the directory has a trailing slash while searching for it.
* [#763](https://github.com/bbatsov/projectile/issues/763): Check for `projectile-use-git-grep` in `helm-projectile-grep`

## 0.12.0 (03/29/2015)

Expand Down
4 changes: 3 additions & 1 deletion helm-projectile.el
Original file line number Diff line number Diff line change
Expand Up @@ -666,7 +666,9 @@ If it is nil, or ack/ack-grep not found then use default grep command."
(helm-grep-ignored-directories (-union (projectile-ignored-directories-rel) grep-find-ignored-directories))
(helm-grep-default-command (if use-ack-p
(concat ack-executable " -H --no-group --no-color " ack-ignored-pattern " %p %f")
"grep -a -r %e -n%cH -e %p %f ."))
(if (and projectile-use-git-grep (eq (projectile-project-vcs) 'git))
"git --no-pager grep --no-color -n -e %p -- %f"
"grep -a -r %e -n%cH -e %p %f .")))
(helm-grep-default-recurse-command helm-grep-default-command)
(helm-source-grep
(helm-build-async-source
Expand Down

0 comments on commit 43b99b7

Please sign in to comment.