branch: externals/urgrep commit 764742fd1434a7b3e44db178eee6359c1236c911 Author: Jim Porter <jporterb...@gmail.com> Commit: Jim Porter <jporterb...@gmail.com>
Recurse submodules with git grep --- urgrep-test.el | 4 ++-- urgrep.el | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/urgrep-test.el b/urgrep-test.el index 150e8f1bd5..9307f786bf 100644 --- a/urgrep-test.el +++ b/urgrep-test.el @@ -39,10 +39,10 @@ (cl-letf (((symbol-function #'urgrep-get-tool) (lambda () (assoc "git-grep" urgrep-tools)))) (should (equal (urgrep-command "foo") - "git -c color.grep.filename\\=magenta grep -n --color --heading --break foo")) + "git -c color.grep.filename\\=magenta grep -n --recurse-submodules --color --heading --break foo")) (let ((urgrep-group-matches nil)) (should (equal (urgrep-command "foo") - "git -c color.grep.filename\\=magenta grep -n --color foo"))))) + "git -c color.grep.filename\\=magenta grep -n --recurse-submodules --color foo"))))) (ert-deftest urgrep-test-command-grep () (cl-letf (((symbol-function #'urgrep-get-tool) diff --git a/urgrep.el b/urgrep.el index 7b50196b29..5e64bb138a 100644 --- a/urgrep.el +++ b/urgrep.el @@ -75,12 +75,11 @@ (always-arguments ("--color-path" "35" "--color-match" "1;31")) (group-arguments ((t ("--group")) (nil ("--nogroup"))))) - ;; XXX: Handle submodules for git-grep. ("git-grep" (executable-name "git") (vc-backend "Git") (always-arguments ("-c" "color.grep.filename=magenta" "grep" "-n" - "--color")) + "--recurse-submodules" "--color")) (group-arguments ((t ("--heading" "--break"))))) ("grep" (executable-name "grep")